Remove more defines in XFA branch that aren't used for PDFium.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/811493002

15 files changed, 0 insertions, 30 deletions

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_png.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_png.c
index 5329a6409d..93c675b085 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_png.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_png.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* png.c - location for general purpose libpng functions

  *

  * Last changed in libpng 1.6.2 [April 25, 2013]

@@ -4296,4 +4295,3 @@ png_image_error(png_imagep image, png_const_charp error_message)
 

 #endif /* SIMPLIFIED READ/WRITE */

 #endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngerror.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngerror.c
index e53c932542..2125e4ca11 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngerror.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngerror.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngerror.c - stub functions for i/o and memory allocation

  *

  * Last changed in libpng 1.6.1 [March 28, 2013]

@@ -930,4 +929,3 @@ png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg)
 }

 #endif /* SIMPLIFIED READ/WRITE */

 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngget.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngget.c
index 56ba97090e..6839f6beef 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngget.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngget.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngget.c - retrieval of values from info struct

  *

  * Last changed in libpng 1.6.1 [March 28, 2013]

@@ -1175,4 +1174,3 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
 #endif

 

 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngmem.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngmem.c
index 446bc6879a..9be580322a 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngmem.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngmem.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngmem.c - stub functions for memory allocation

  *

  * Last changed in libpng 1.6.0 [February 14, 2013]

@@ -288,4 +287,3 @@ png_get_mem_ptr(png_const_structrp png_ptr)
 }

 #endif /* PNG_USER_MEM_SUPPORTED */

 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngpread.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngpread.c
index 6d5053f849..afb2abf357 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngpread.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngpread.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngpread.c - read a png file in push mode

  *

  * Last changed in libpng 1.6.0 [February 14, 2013]

@@ -1289,4 +1288,3 @@ png_get_progressive_ptr(png_const_structrp png_ptr)
    return png_ptr->io_ptr;

 }

 #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngread.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngread.c
index 3918e8396f..b30c5a1009 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngread.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngread.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngread.c - read a PNG file

  *

  * Last changed in libpng 1.6.1 [March 28, 2013]

@@ -3998,4 +3997,3 @@ png_image_finish_read(png_imagep image, png_const_colorp background,
 

 #endif /* PNG_SIMPLIFIED_READ_SUPPORTED */

 #endif /* PNG_READ_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrio.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrio.c
index 5f927d127b..d27a26d5bc 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrio.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrio.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngrio.c - functions for data input

  *

  * Last changed in libpng 1.6.0 [February 14, 2013]

@@ -116,4 +115,3 @@ png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr,
 #endif

 }

 #endif /* PNG_READ_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrtran.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrtran.c
index 4a279be3ff..a81034cdf1 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrtran.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrtran.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngrtran.c - transforms the data in a row for PNG readers

  *

  * Last changed in libpng 1.6.2 [April 25, 2013]

@@ -5101,4 +5100,3 @@ png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
 }

 #endif /* PNG_MNG_FEATURES_SUPPORTED */

 #endif /* PNG_READ_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrutil.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrutil.c
index d12395a18d..970ec4d4d9 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrutil.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrutil.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngrutil.c - utilities to read a PNG file

  *

  * Last changed in libpng 1.6.3 [July 18, 2013]

@@ -4470,4 +4469,3 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
    png_ptr->flags |= PNG_FLAG_ROW_INIT;

 }

 #endif /* PNG_READ_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngset.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngset.c
index 8fd7445f2f..b4790521bb 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngset.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngset.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngset.c - storage of image information into info struct

  *

  * Last changed in libpng 1.6.3 [July 18, 2013]

@@ -1595,4 +1594,3 @@ png_set_check_for_invalid_index(png_structrp png_ptr, int allowed)
 }

 #endif

 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngtrans.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngtrans.c
index a46b0fc331..0de6a46f30 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngtrans.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngtrans.c
@@ -1,4 +1,3 @@
-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 /* pngtrans.c - transforms the data in a row (used by both readers and writers)

  *

  * Last changed in libpng 1.6.2 [April 25, 2013]

@@ -839,4 +838,3 @@ png_get_current_pass_number(png_const_structrp png_ptr)
 #endif /* PNG_READ_USER_TRANSFORM_SUPPORTED ||

           PNG_WRITE_USER_TRANSFORM_SUPPORTED */

 #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */

-#endif

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwio.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwio.c
index 5f3133e5d5..9268c163b0 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwio.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwio.c
@@ -17,7 +17,6 @@
  * functions, but rather write replacement functions and then change

  * them at run time with png_set_write_fn(...).

  */

-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 #include "pngpriv.h"

 

 #ifdef PNG_WRITE_SUPPORTED

@@ -162,4 +161,3 @@ png_set_write_fn(png_structrp png_ptr, png_voidp io_ptr,
    }

 }

 #endif /* PNG_WRITE_SUPPORTED */

-#endif//_FPDFAPI_MINI_

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwrite.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwrite.c
index 7efcfc3a26..f48ed970ff 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwrite.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwrite.c
@@ -10,7 +10,6 @@
  * For conditions of distribution and use, see the disclaimer

  * and license in png.h

  */

-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 #include "pngpriv.h"

 #if defined(PNG_SIMPLIFIED_WRITE_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)

 #  include <errno.h>

@@ -2328,4 +2327,3 @@ png_image_write_to_file(png_imagep image, const char *file_name,
 #endif /* PNG_STDIO_SUPPORTED */

 #endif /* SIMPLIFIED_WRITE */

 #endif /* PNG_WRITE_SUPPORTED */

-#endif//_FPDFAPI_MINI_

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwtran.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwtran.c
index 8f2811099a..1fc3340e2c 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwtran.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwtran.c
@@ -10,7 +10,6 @@
  * For conditions of distribution and use, see the disclaimer

  * and license in png.h

  */

-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 #include "pngpriv.h"

 

 #ifdef PNG_WRITE_SUPPORTED

@@ -635,4 +634,3 @@ png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
 }

 #endif /* PNG_MNG_FEATURES_SUPPORTED */

 #endif /* PNG_WRITE_SUPPORTED */

-#endif//_FPDFAPI_MINI_

diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwutil.c b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwutil.c
index 40955b9381..dd5d659f3c 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwutil.c
+++ b/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwutil.c
@@ -10,7 +10,6 @@
  * For conditions of distribution and use, see the disclaimer

  * and license in png.h

  */

-#if (!defined(_FPDFAPI_MINI_) || defined(_FXCORE_FEATURE_ALL_) || defined(_PNG_DECODER_)) && !defined(_USE_ADDIN_) && !defined(_FX_EMB_NOUSE_DECODER_)

 #include "pngpriv.h"

 

 #ifdef PNG_WRITE_SUPPORTED

@@ -3021,4 +3020,3 @@ png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
 #endif

 }

 #endif /* PNG_WRITE_SUPPORTED */

-#endif//_FPDFAPI_MINI_