Clang-format some code in core/.
Use "git cl format --full" to tidy code a bit more.
Change-Id: I431cfd7cd831baf9c886c4667beab5662f181005
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/63732
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fdrm/fx_crypt.cpp b/core/fdrm/fx_crypt.cpp
index 3d388d7..9d233dd 100644
--- a/core/fdrm/fx_crypt.cpp
+++ b/core/fdrm/fx_crypt.cpp
@@ -225,9 +225,7 @@
PUT_UINT32(context->state[3], digest, 12);
}
-void CRYPT_MD5Generate(const uint8_t* data,
- uint32_t size,
- uint8_t digest[16]) {
+void CRYPT_MD5Generate(const uint8_t* data, uint32_t size, uint8_t digest[16]) {
CRYPT_md5_context ctx;
CRYPT_MD5Start(&ctx);
CRYPT_MD5Update(&ctx, data, size);
diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp
index fcd84a6..f3011db 100644
--- a/core/fpdfapi/page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/page/cpdf_colorspace.cpp
@@ -255,7 +255,6 @@
const CPDF_Array* pArray,
std::set<const CPDF_Object*>* pVisited) override;
-
private:
explicit CPDF_IndexedCS(CPDF_Document* pDoc);
diff --git a/core/fpdfapi/parser/cpdf_simple_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_simple_parser_unittest.cpp
index 254d084..5834d77 100644
--- a/core/fpdfapi/parser/cpdf_simple_parser_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_simple_parser_unittest.cpp
@@ -38,13 +38,15 @@
STR_IN_OUT_CASE("\t\t<< /abc>>", "<<"),
// Handling ending delimiters.
STR_IN_OUT_CASE("> little bear", ">"),
- STR_IN_OUT_CASE(") another bear", ")"), STR_IN_OUT_CASE(">> end ", ">>"),
+ STR_IN_OUT_CASE(") another bear", ")"),
+ STR_IN_OUT_CASE(">> end ", ">>"),
// No ending delimiters.
STR_IN_OUT_CASE("(sdfgfgbcv", "(sdfgfgbcv"),
// Regular cases.
STR_IN_OUT_CASE("apple pear", "apple"),
STR_IN_OUT_CASE(" pi=3.1415 ", "pi=3.1415"),
- STR_IN_OUT_CASE(" p t x c ", "p"), STR_IN_OUT_CASE(" pt\0xc ", "pt"),
+ STR_IN_OUT_CASE(" p t x c ", "p"),
+ STR_IN_OUT_CASE(" pt\0xc ", "pt"),
STR_IN_OUT_CASE(" $^&&*\t\0sdff ", "$^&&*"),
STR_IN_OUT_CASE("\n\r+3.5656 -11.0", "+3.5656"),
};
diff --git a/core/fpdfdoc/cpdf_dest_unittest.cpp b/core/fpdfdoc/cpdf_dest_unittest.cpp
index 9c258e5..07e46b3 100644
--- a/core/fpdfdoc/cpdf_dest_unittest.cpp
+++ b/core/fpdfdoc/cpdf_dest_unittest.cpp
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "core/fpdfdoc/cpdf_dest.h"
+
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_name.h"
#include "core/fpdfapi/parser/cpdf_null.h"
#include "core/fpdfapi/parser/cpdf_number.h"
-#include "core/fpdfdoc/cpdf_dest.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/base/ptr_util.h"
diff --git a/core/fpdfdoc/cpdf_formfield_unittest.cpp b/core/fpdfdoc/cpdf_formfield_unittest.cpp
index 39e422d..24c92c1 100644
--- a/core/fpdfdoc/cpdf_formfield_unittest.cpp
+++ b/core/fpdfdoc/cpdf_formfield_unittest.cpp
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "core/fpdfdoc/cpdf_formfield.h"
+
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_indirect_object_holder.h"
#include "core/fpdfapi/parser/cpdf_name.h"
#include "core/fpdfapi/parser/cpdf_reference.h"
-#include "core/fpdfdoc/cpdf_formfield.h"
#include "testing/gtest/include/gtest/gtest.h"
TEST(cpdf_formfield, FPDF_GetFullName) {
diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index b66fc3c..5468743 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -499,8 +499,10 @@
RetainPtr<CPDF_Dictionary> pExtGStateDict,
RetainPtr<CPDF_Dictionary> pResourceFontDict) {
auto pResourceDict = pDoc->New<CPDF_Dictionary>();
- if (pExtGStateDict) pResourceDict->SetFor("ExtGState", pExtGStateDict);
- if (pResourceFontDict) pResourceDict->SetFor("Font", pResourceFontDict);
+ if (pExtGStateDict)
+ pResourceDict->SetFor("ExtGState", pExtGStateDict);
+ if (pResourceFontDict)
+ pResourceDict->SetFor("Font", pResourceFontDict);
return pResourceDict;
}
diff --git a/core/fpdftext/cpdf_linkextract.cpp b/core/fpdftext/cpdf_linkextract.cpp
index 399db50..7f66832 100644
--- a/core/fpdftext/cpdf_linkextract.cpp
+++ b/core/fpdftext/cpdf_linkextract.cpp
@@ -203,8 +203,8 @@
auto start = str.Find(kHttpScheme);
if (start.has_value()) {
size_t off = start.value() + kHttpSchemeLen; // move after "http".
- if (len > off + 4) { // At least "://<char>" follows.
- if (str[off] == L's') // "https" scheme is accepted.
+ if (len > off + 4) { // At least "://<char>" follows.
+ if (str[off] == L's') // "https" scheme is accepted.
off++;
if (str[off] == L':' && str[off + 1] == L'/' && str[off + 2] == L'/') {
off += 3;
diff --git a/core/fxcodec/jbig2/JBig2_Image.cpp b/core/fxcodec/jbig2/JBig2_Image.cpp
index 5054ab5..3cfb4f8 100644
--- a/core/fxcodec/jbig2/JBig2_Image.cpp
+++ b/core/fxcodec/jbig2/JBig2_Image.cpp
@@ -230,7 +230,7 @@
const uint8_t* pSrc = pLineSrc + m;
const uint8_t* pSrcEnd = pLineSrc + m_nStride;
uint8_t* pDstEnd = pLineDst + bytes_to_copy;
- for (uint8_t *pDst = pLineDst; pDst < pDstEnd; pSrc += 4, pDst += 4) {
+ for (uint8_t* pDst = pLineDst; pDst < pDstEnd; pSrc += 4, pDst += 4) {
uint32_t wTmp = JBIG2_GETDWORD(pSrc) << n;
if (pSrc + 4 < pSrcEnd)
wTmp |= (JBIG2_GETDWORD(pSrc + 4) >> (32 - n));
diff --git a/core/fxcrt/fx_memory_unittest.cpp b/core/fxcrt/fx_memory_unittest.cpp
index d8274f9..b3fd299 100644
--- a/core/fxcrt/fx_memory_unittest.cpp
+++ b/core/fxcrt/fx_memory_unittest.cpp
@@ -22,7 +22,7 @@
TEST(fxcrt, FX_AllocZero) {
uint8_t* ptr = FX_Alloc(uint8_t, 0);
uint8_t* ptr2 = FX_Alloc(uint8_t, 0);
- EXPECT_TRUE(ptr); // Malloc(0) is distinguishable from OOM.
+ EXPECT_TRUE(ptr); // Malloc(0) is distinguishable from OOM.
EXPECT_NE(ptr, ptr2); // Each malloc(0) is distinguishable.
FX_Free(ptr2);
FX_Free(ptr);
diff --git a/core/fxcrt/fx_number.h b/core/fxcrt/fx_number.h
index bfb575e..0ee4744 100644
--- a/core/fxcrt/fx_number.h
+++ b/core/fxcrt/fx_number.h
@@ -22,7 +22,7 @@
bool IsInteger() const { return m_bInteger; }
bool IsSigned() const { return m_bSigned; }
- int32_t GetSigned() const; // Underflow/Overflow possible.
+ int32_t GetSigned() const; // Underflow/Overflow possible.
float GetFloat() const;
private:
diff --git a/core/fxcrt/retain_ptr.h b/core/fxcrt/retain_ptr.h
index f69f764..4507d69 100644
--- a/core/fxcrt/retain_ptr.h
+++ b/core/fxcrt/retain_ptr.h
@@ -141,8 +141,8 @@
} // namespace fxcrt
using fxcrt::ReleaseDeleter;
-using fxcrt::RetainPtr;
using fxcrt::Retainable;
+using fxcrt::RetainPtr;
namespace pdfium {
diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp
index 6f58215..5c15a9c 100644
--- a/core/fxge/dib/cfx_imagerenderer.cpp
+++ b/core/fxge/dib/cfx_imagerenderer.cpp
@@ -29,8 +29,9 @@
m_MaskColor(mask_color),
m_bRgbByteOrder(bRgbByteOrder) {
FX_RECT image_rect = m_Matrix.GetUnitRect().GetOuterRect();
- m_ClipBox = pClipRgn ? pClipRgn->GetBox() : FX_RECT(0, 0, pDevice->GetWidth(),
- pDevice->GetHeight());
+ m_ClipBox = pClipRgn
+ ? pClipRgn->GetBox()
+ : FX_RECT(0, 0, pDevice->GetWidth(), pDevice->GetHeight());
m_ClipBox.Intersect(image_rect);
if (m_ClipBox.IsEmpty())
return;
diff --git a/core/fxge/fx_ge_linux.cpp b/core/fxge/fx_ge_linux.cpp
index 38d99b8..d76d39d 100644
--- a/core/fxge/fx_ge_linux.cpp
+++ b/core/fxge/fx_ge_linux.cpp
@@ -34,11 +34,15 @@
};
const char* const g_LinuxGbFontList[] = {
- "AR PL UMing CN Light", "WenQuanYi Micro Hei", "AR PL UKai CN",
+ "AR PL UMing CN Light",
+ "WenQuanYi Micro Hei",
+ "AR PL UKai CN",
};
const char* const g_LinuxB5FontList[] = {
- "AR PL UMing TW Light", "WenQuanYi Micro Hei", "AR PL UKai TW",
+ "AR PL UMing TW Light",
+ "WenQuanYi Micro Hei",
+ "AR PL UKai TW",
};
const char* const g_LinuxHGFontList[] = {
diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp
index 892c840..272e408 100644
--- a/core/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/fxge/win32/fx_win32_gdipext.cpp
@@ -22,8 +22,8 @@
// Has to come before gdiplus.h
namespace Gdiplus {
-using std::min;
using std::max;
+using std::min;
} // namespace Gdiplus
#include <gdiplus.h> // NOLINT
