Get rid of _FX_JPEG_TURBO_
Instead, set the libjpeg to use via GYP/GN.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1433803002 .
diff --git a/third_party/libjpeg/fpdfapi_jcapimin.c b/third_party/libjpeg/fpdfapi_jcapimin.c
index ec04fd2..54fb8c5 100644
--- a/third_party/libjpeg/fpdfapi_jcapimin.c
+++ b/third_party/libjpeg/fpdfapi_jcapimin.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcapimin.c
*
@@ -279,5 +278,3 @@
* each call to jpeg_write_tables().
*/
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcapistd.c b/third_party/libjpeg/fpdfapi_jcapistd.c
index 9d765e6..c0320b1 100644
--- a/third_party/libjpeg/fpdfapi_jcapistd.c
+++ b/third_party/libjpeg/fpdfapi_jcapistd.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcapistd.c
*
@@ -160,5 +159,3 @@
cinfo->next_scanline += lines_per_iMCU_row;
return lines_per_iMCU_row;
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jccoefct.c b/third_party/libjpeg/fpdfapi_jccoefct.c
index 08910ef..1963ddb 100644
--- a/third_party/libjpeg/fpdfapi_jccoefct.c
+++ b/third_party/libjpeg/fpdfapi_jccoefct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jccoefct.c
*
@@ -448,5 +447,3 @@
coef->whole_image[0] = NULL; /* flag for no virtual arrays */
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jccolor.c b/third_party/libjpeg/fpdfapi_jccolor.c
index 809a05b..0a8a4b5 100644
--- a/third_party/libjpeg/fpdfapi_jccolor.c
+++ b/third_party/libjpeg/fpdfapi_jccolor.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jccolor.c
*
@@ -458,5 +457,3 @@
break;
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcdctmgr.c b/third_party/libjpeg/fpdfapi_jcdctmgr.c
index cbd7d11..61fa79b 100644
--- a/third_party/libjpeg/fpdfapi_jcdctmgr.c
+++ b/third_party/libjpeg/fpdfapi_jcdctmgr.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcdctmgr.c
*
@@ -386,5 +385,3 @@
#endif
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jchuff.c b/third_party/libjpeg/fpdfapi_jchuff.c
index 2a65aa2..02d91e2 100644
--- a/third_party/libjpeg/fpdfapi_jchuff.c
+++ b/third_party/libjpeg/fpdfapi_jchuff.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jchuff.c
*
@@ -911,5 +910,3 @@
#endif
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcinit.c b/third_party/libjpeg/fpdfapi_jcinit.c
index 58e5d18..5efffe3 100644
--- a/third_party/libjpeg/fpdfapi_jcinit.c
+++ b/third_party/libjpeg/fpdfapi_jcinit.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcinit.c
*
@@ -71,5 +70,3 @@
*/
(*cinfo->marker->write_file_header) (cinfo);
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcmainct.c b/third_party/libjpeg/fpdfapi_jcmainct.c
index 4bf2c40..e0279a7 100644
--- a/third_party/libjpeg/fpdfapi_jcmainct.c
+++ b/third_party/libjpeg/fpdfapi_jcmainct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcmainct.c
*
@@ -292,5 +291,3 @@
}
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcmarker.c b/third_party/libjpeg/fpdfapi_jcmarker.c
index f1c89d9..3d1e6c6 100644
--- a/third_party/libjpeg/fpdfapi_jcmarker.c
+++ b/third_party/libjpeg/fpdfapi_jcmarker.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcmarker.c
*
@@ -663,5 +662,3 @@
/* Initialize private state */
marker->last_restart_interval = 0;
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcmaster.c b/third_party/libjpeg/fpdfapi_jcmaster.c
index 45322a5..aab4020 100644
--- a/third_party/libjpeg/fpdfapi_jcmaster.c
+++ b/third_party/libjpeg/fpdfapi_jcmaster.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcmaster.c
*
@@ -589,5 +588,3 @@
else
master->total_passes = cinfo->num_scans;
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcomapi.c b/third_party/libjpeg/fpdfapi_jcomapi.c
index aad37d8..9b1fa75 100644
--- a/third_party/libjpeg/fpdfapi_jcomapi.c
+++ b/third_party/libjpeg/fpdfapi_jcomapi.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcomapi.c
*
@@ -105,5 +104,3 @@
tbl->sent_table = FALSE; /* make sure this is false in any new table */
return tbl;
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcparam.c b/third_party/libjpeg/fpdfapi_jcparam.c
index f3ea109..6fc48f5 100644
--- a/third_party/libjpeg/fpdfapi_jcparam.c
+++ b/third_party/libjpeg/fpdfapi_jcparam.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcparam.c
*
@@ -609,5 +608,3 @@
}
#endif /* C_PROGRESSIVE_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcphuff.c b/third_party/libjpeg/fpdfapi_jcphuff.c
index 6d89b6b..07f9178 100644
--- a/third_party/libjpeg/fpdfapi_jcphuff.c
+++ b/third_party/libjpeg/fpdfapi_jcphuff.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcphuff.c
*
@@ -832,5 +831,3 @@
}
#endif /* C_PROGRESSIVE_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcprepct.c b/third_party/libjpeg/fpdfapi_jcprepct.c
index 57f3fc1..fa93333 100644
--- a/third_party/libjpeg/fpdfapi_jcprepct.c
+++ b/third_party/libjpeg/fpdfapi_jcprepct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcprepct.c
*
@@ -353,5 +352,3 @@
}
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jcsample.c b/third_party/libjpeg/fpdfapi_jcsample.c
index 5e1e828..212ec87 100644
--- a/third_party/libjpeg/fpdfapi_jcsample.c
+++ b/third_party/libjpeg/fpdfapi_jcsample.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jcsample.c
*
@@ -518,5 +517,3 @@
TRACEMS(cinfo, 0, JTRC_SMOOTH_NOTIMPL);
#endif
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jctrans.c b/third_party/libjpeg/fpdfapi_jctrans.c
index 40d1667..0e6d707 100644
--- a/third_party/libjpeg/fpdfapi_jctrans.c
+++ b/third_party/libjpeg/fpdfapi_jctrans.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jctrans.c
*
@@ -387,5 +386,3 @@
coef->dummy_buffer[i] = buffer + i;
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdapimin.c b/third_party/libjpeg/fpdfapi_jdapimin.c
index 80c52cd..cadb59f 100644
--- a/third_party/libjpeg/fpdfapi_jdapimin.c
+++ b/third_party/libjpeg/fpdfapi_jdapimin.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdapimin.c
*
@@ -394,5 +393,3 @@
jpeg_abort((j_common_ptr) cinfo);
return TRUE;
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdapistd.c b/third_party/libjpeg/fpdfapi_jdapistd.c
index 4c31f76..39bbb96 100644
--- a/third_party/libjpeg/fpdfapi_jdapistd.c
+++ b/third_party/libjpeg/fpdfapi_jdapistd.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdapistd.c
*
@@ -275,5 +274,3 @@
}
#endif /* D_MULTISCAN_FILES_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdcoefct.c b/third_party/libjpeg/fpdfapi_jdcoefct.c
index 099833a..4938d20 100644
--- a/third_party/libjpeg/fpdfapi_jdcoefct.c
+++ b/third_party/libjpeg/fpdfapi_jdcoefct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdcoefct.c
*
@@ -735,5 +734,3 @@
coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdcolor.c b/third_party/libjpeg/fpdfapi_jdcolor.c
index c17329b..6c04dfe 100644
--- a/third_party/libjpeg/fpdfapi_jdcolor.c
+++ b/third_party/libjpeg/fpdfapi_jdcolor.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdcolor.c
*
@@ -395,5 +394,3 @@
else
cinfo->output_components = cinfo->out_color_components;
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jddctmgr.c b/third_party/libjpeg/fpdfapi_jddctmgr.c
index 5226456..bbf8d0e 100644
--- a/third_party/libjpeg/fpdfapi_jddctmgr.c
+++ b/third_party/libjpeg/fpdfapi_jddctmgr.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jddctmgr.c
*
@@ -268,5 +267,3 @@
idct->cur_method[ci] = -1;
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdhuff.c b/third_party/libjpeg/fpdfapi_jdhuff.c
index dc37db5..4b0454d 100644
--- a/third_party/libjpeg/fpdfapi_jdhuff.c
+++ b/third_party/libjpeg/fpdfapi_jdhuff.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdhuff.c
*
@@ -653,5 +652,3 @@
entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdinput.c b/third_party/libjpeg/fpdfapi_jdinput.c
index 6e714e9..0c2ac8f 100644
--- a/third_party/libjpeg/fpdfapi_jdinput.c
+++ b/third_party/libjpeg/fpdfapi_jdinput.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdinput.c
*
@@ -380,5 +379,3 @@
inputctl->pub.eoi_reached = FALSE;
inputctl->inheaders = TRUE;
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdmainct.c b/third_party/libjpeg/fpdfapi_jdmainct.c
index 1483e6f..13c956f 100644
--- a/third_party/libjpeg/fpdfapi_jdmainct.c
+++ b/third_party/libjpeg/fpdfapi_jdmainct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdmainct.c
*
@@ -511,5 +510,3 @@
(JDIMENSION) (rgroup * ngroups));
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdmarker.c b/third_party/libjpeg/fpdfapi_jdmarker.c
index bcd017f..449a3c0 100644
--- a/third_party/libjpeg/fpdfapi_jdmarker.c
+++ b/third_party/libjpeg/fpdfapi_jdmarker.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdmarker.c
*
@@ -1392,5 +1391,3 @@
else
ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdmaster.c b/third_party/libjpeg/fpdfapi_jdmaster.c
index dae51e0..2802c5b 100644
--- a/third_party/libjpeg/fpdfapi_jdmaster.c
+++ b/third_party/libjpeg/fpdfapi_jdmaster.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdmaster.c
*
@@ -556,5 +555,3 @@
master_selection(cinfo);
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdmerge.c b/third_party/libjpeg/fpdfapi_jdmerge.c
index c229f86..519bbad 100644
--- a/third_party/libjpeg/fpdfapi_jdmerge.c
+++ b/third_party/libjpeg/fpdfapi_jdmerge.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdmerge.c
*
@@ -402,5 +401,3 @@
}
#endif /* UPSAMPLE_MERGING_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdphuff.c b/third_party/libjpeg/fpdfapi_jdphuff.c
index 128e412..2267809 100644
--- a/third_party/libjpeg/fpdfapi_jdphuff.c
+++ b/third_party/libjpeg/fpdfapi_jdphuff.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdphuff.c
*
@@ -667,5 +666,3 @@
}
#endif /* D_PROGRESSIVE_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdpostct.c b/third_party/libjpeg/fpdfapi_jdpostct.c
index 13b1b1b..571563d 100644
--- a/third_party/libjpeg/fpdfapi_jdpostct.c
+++ b/third_party/libjpeg/fpdfapi_jdpostct.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdpostct.c
*
@@ -289,5 +288,3 @@
}
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdsample.c b/third_party/libjpeg/fpdfapi_jdsample.c
index da9c38c..80ffefb 100644
--- a/third_party/libjpeg/fpdfapi_jdsample.c
+++ b/third_party/libjpeg/fpdfapi_jdsample.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdsample.c
*
@@ -477,5 +476,3 @@
}
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jdtrans.c b/third_party/libjpeg/fpdfapi_jdtrans.c
index ae44f36..6c0ab71 100644
--- a/third_party/libjpeg/fpdfapi_jdtrans.c
+++ b/third_party/libjpeg/fpdfapi_jdtrans.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jdtrans.c
*
@@ -142,5 +141,3 @@
cinfo->progress->total_passes = 1;
}
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jerror.c b/third_party/libjpeg/fpdfapi_jerror.c
index 282f889..adfb9fe 100644
--- a/third_party/libjpeg/fpdfapi_jerror.c
+++ b/third_party/libjpeg/fpdfapi_jerror.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jerror.c
*
@@ -238,5 +237,3 @@
return err;
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jfdctfst.c b/third_party/libjpeg/fpdfapi_jfdctfst.c
index b978b46..ccb378a 100644
--- a/third_party/libjpeg/fpdfapi_jfdctfst.c
+++ b/third_party/libjpeg/fpdfapi_jfdctfst.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jfdctfst.c
*
@@ -223,5 +222,3 @@
}
#endif /* DCT_IFAST_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jfdctint.c b/third_party/libjpeg/fpdfapi_jfdctint.c
index 488505b..0a78b64 100644
--- a/third_party/libjpeg/fpdfapi_jfdctint.c
+++ b/third_party/libjpeg/fpdfapi_jfdctint.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jfdctint.c
*
@@ -282,5 +281,3 @@
}
#endif /* DCT_ISLOW_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jidctfst.c b/third_party/libjpeg/fpdfapi_jidctfst.c
index 26a8f68..dba4216 100644
--- a/third_party/libjpeg/fpdfapi_jidctfst.c
+++ b/third_party/libjpeg/fpdfapi_jidctfst.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jidctfst.c
*
@@ -367,5 +366,3 @@
}
#endif /* DCT_IFAST_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jidctint.c b/third_party/libjpeg/fpdfapi_jidctint.c
index 78a8d66..a72b320 100644
--- a/third_party/libjpeg/fpdfapi_jidctint.c
+++ b/third_party/libjpeg/fpdfapi_jidctint.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jidctint.c
*
@@ -388,5 +387,3 @@
}
#endif /* DCT_ISLOW_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jidctred.c b/third_party/libjpeg/fpdfapi_jidctred.c
index 8b4b807..421f3c7 100644
--- a/third_party/libjpeg/fpdfapi_jidctred.c
+++ b/third_party/libjpeg/fpdfapi_jidctred.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jidctred.c
*
@@ -397,5 +396,3 @@
}
#endif /* IDCT_SCALING_SUPPORTED */
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jmemmgr.c b/third_party/libjpeg/fpdfapi_jmemmgr.c
index 630102f..47ead48 100644
--- a/third_party/libjpeg/fpdfapi_jmemmgr.c
+++ b/third_party/libjpeg/fpdfapi_jmemmgr.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jmemmgr.c
*
@@ -1119,5 +1118,3 @@
#endif
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jmemnobs.c b/third_party/libjpeg/fpdfapi_jmemnobs.c
index f1f789a..201c5d6 100644
--- a/third_party/libjpeg/fpdfapi_jmemnobs.c
+++ b/third_party/libjpeg/fpdfapi_jmemnobs.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jmemnobs.c
*
@@ -122,5 +121,3 @@
{
/* no work */
}
-
-#endif //_FX_JPEG_TURBO_
diff --git a/third_party/libjpeg/fpdfapi_jutils.c b/third_party/libjpeg/fpdfapi_jutils.c
index c6f7248..d18a955 100644
--- a/third_party/libjpeg/fpdfapi_jutils.c
+++ b/third_party/libjpeg/fpdfapi_jutils.c
@@ -1,4 +1,3 @@
-#if !defined(_FX_JPEG_TURBO_)
/*
* jutils.c
*
@@ -178,5 +177,3 @@
}
#endif
}
-
-#endif //_FX_JPEG_TURBO_
