summaryrefslogtreecommitdiff
path: root/core/src/fxge
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jam@chromium.org>2014-05-20 14:34:30 -0700
committerJohn Abd-El-Malek <jam@chromium.org>2014-05-20 14:34:30 -0700
commit4db62f5d942a3a7be00bfb5711836ce9e2c89f4b (patch)
tree7b48dc24263826cffb45cccc889939e0621e90d6 /core/src/fxge
parent2c4b0465c1b95016a75a5fa10abe0ebb73170ee6 (diff)
downloadpdfium-4db62f5d942a3a7be00bfb5711836ce9e2c89f4b.tar.xz
Fixed or silenced all warnings and turned on warnings-as-errors.
- Silence -Wheader-hygiene warning on Clang. Between fx_agg_driver.cpp and fxjs_v8.h there are hundreds or thousands of things that depend on "using namespace", so it is best to just suppress this warning than fix it. - gzguts.h: Include unistd.h on all non-Windows platforms, not just Apple platforms. Fixes implicit include warnings on Linux. - Added parens to silence a warning about mixing && and ||. - Removed a check if an enum is negative. Enums can be unsigned, generating an always-false warning. The check isn't necessary. - Removed some statements that are just names of variables that do nothing. BUG=375114 Patch by Matt Giuca <mgiuca@chromium.org>
Diffstat (limited to 'core/src/fxge')
-rw-r--r--core/src/fxge/agg/agg23/fx_agg_driver.cpp2
-rw-r--r--core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttload.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/core/src/fxge/agg/agg23/fx_agg_driver.cpp b/core/src/fxge/agg/agg23/fx_agg_driver.cpp
index e0fd065532..c3f42bf9f9 100644
--- a/core/src/fxge/agg/agg23/fx_agg_driver.cpp
+++ b/core/src/fxge/agg/agg23/fx_agg_driver.cpp
@@ -616,7 +616,6 @@ public:
int col_start = span_left < clip_left ? clip_left - span_left : 0;
int col_end = (span_left + span_len) < clip_right ? span_len : (clip_right - span_left);
dest_scan += col_start;
- Bpp;
if (dest_extra_alpha_scan) {
for (int col = col_start; col < col_end; col ++) {
int src_alpha;
@@ -884,7 +883,6 @@ public:
int col_start = span_left < clip_left ? clip_left - span_left : 0;
int col_end = (span_left + span_len) < clip_right ? span_len : (clip_right - span_left);
dest_scan += col_start * 4;
- Bpp;
if (dest_extra_alpha_scan) {
for (int col = col_start; col < col_end; col ++) {
int src_alpha;
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttload.c b/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttload.c
index 38b7559e13..95eb2bb14c 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttload.c
+++ b/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/ttload.c
@@ -58,7 +58,7 @@
TT_Table temp = NULL;
if (!entry) return NULL;
- for (first; first < limit; first++){
+ for (; first < limit; first++){
if (entry->Offset + entry->Length <= first->Offset){
if (!temp || first->Offset < temp->Offset){
temp = first;