Change depends on libjpeg to libjpeg-turbo

Signed-off-by: Nbenb365 <liuyongchang1@huawei.com>
Change-Id: I26c5e142972efa25489a07bc63076c9e7e390b8b

BUILD.gn

@@ -227,7 +227,7 @@ lite_library("ui") {
       "//third_party/freetype:freetype",
       "//third_party/giflib:libgif",
       "//third_party/icu/icu4c/source/common:icu_font",
-      "//third_party/libjpeg:libjpeg",
+      "//third_party/libjpeg-turbo:libjpeg",
       "//third_party/libpng:libpng",
       "//third_party/qrcodegen:qrcodegen",
     ]
@@ -243,7 +243,7 @@ lite_library("ui") {
       "//third_party/freetype:freetype",
       "//third_party/giflib:libgif",
       "//third_party/icu/icu4c/source/common:icu_font",
-      "//third_party/libjpeg:libjpeg",
+      "//third_party/libjpeg-turbo:libjpeg",
       "//third_party/libpng:libpng",
       "//third_party/qrcodegen:qrcodegen",
     ]

bundle.json

@@ -19,7 +19,7 @@
     "ram": "~90KB",
     "deps": {
       "third_party": [
-        "libjpeg",
+        "libjpeg-turbo",
         "cjson",
         "freetype"
       ]

ext/updater/BUILD.gn

@@ -66,7 +66,7 @@ ohos_static_library("libupdater_layout") {
   deps = [
     "//third_party/bounds_checking_function:libsec_static",
     "//third_party/freetype:freetype_static",
-    "//third_party/libjpeg:libjpeg_static",
+    "//third_party/libjpeg-turbo:turbojpeg_static",
     "//third_party/libpng:libpng",
   ]
 }

tools/qt/simulator/libui/libui.pro

@@ -358,13 +358,13 @@ INCLUDEPATH += \
     ../../../../../../../third_party/icu/icu4c/source/common \
     ../../../../../../../third_party/freetype/include \
     ../../../../../../../third_party/cJSON \
-    ../../../../../../../third_party/libjpeg \
+    ../../../../../../../third_party/libjpeg-turbo \
     ../../../../../../../third_party/libpng \
     ../../../../../../../third_party/qrcodegen/cpp \
     ../../../../../../../third_party/giflib
 
 LIBS += $$OUT_PWD/../libs/libpng.dll
-LIBS += $$OUT_PWD/../libs/libjpeg.dll
+LIBS += $$OUT_PWD/../libs/libjpeg-turbo.dll
 LIBS += $$OUT_PWD/../libs/qrcodegen.dll
 LIBS += $$OUT_PWD/../libs/freetype.dll
 LIBS += $$OUT_PWD/../libs/libharfbuzz.a

tools/qt/simulator/simulator.pro

@@ -6,7 +6,7 @@ SUBDIRS += \
     third_party/giflib \
     third_party/harfbuzz \
     third_party/icu \
-    third_party/libjpeg \
+    third_party/libjpeg-turbo \
     third_party/zlib \
     third_party/libpng \
     third_party/freetype \

tools/qt/simulator/test/test.pro

@@ -177,7 +177,7 @@ INCLUDEPATH += \
     ../../../../../../../third_party/icu/icu4c/source/common \
     ../../../../../../../third_party/freetype/include \
     ../../../../../../../third_party/cJSON \
-    ../../../../../../../third_party/libjpeg \
+    ../../../../../../../third_party/libjpeg-turbo \
     ../../../../../../../third_party/libpng \
     ../../../../../../../third_party/giflib
 LIBS += $$OUT_PWD/../libs/libui.dll

tools/qt/simulator/third_party/libjpeg-turbo/libjpeg-turbo.pro

+CONFIG -= qt
+
+TEMPLATE = lib
+DEFINES += LIBJPEGTURBO_LIBRARY
+
+CONFIG += c++11
+
+# The following define makes your compiler emit warnings if you use
+# any Qt feature that has been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+DESTDIR = ../../libs
+SOURCE_PATH = ../../../../../../../../third_party/libjpeg-turbo
+
+SOURCES += \
+      $${SOURCE_PATH}/jcapimin.c \
+      $${SOURCE_PATH}/jcapistd.c \
+      $${SOURCE_PATH}/jccoefct.c \
+      $${SOURCE_PATH}/jccolor.c \
+      $${SOURCE_PATH}/jcdctmgr.c \
+      $${SOURCE_PATH}/jchuff.c \
+      $${SOURCE_PATH}/jcicc.c \
+      $${SOURCE_PATH}/jcinit.c \
+      $${SOURCE_PATH}/jcmainct.c \
+      $${SOURCE_PATH}/jcmarker.c \
+      $${SOURCE_PATH}/jcmaster.c \
+      $${SOURCE_PATH}/jcomapi.c \
+      $${SOURCE_PATH}/jcparam.c \
+      $${SOURCE_PATH}/jcphuff.c \
+      $${SOURCE_PATH}/jcprepct.c \
+      $${SOURCE_PATH}/jcsample.c \
+      $${SOURCE_PATH}/jctrans.c \
+      $${SOURCE_PATH}/jdapimin.c \
+      $${SOURCE_PATH}/jdapistd.c \
+      $${SOURCE_PATH}/jdatadst.c \
+      $${SOURCE_PATH}/jdatasrc.c \
+      $${SOURCE_PATH}/jdcoefct.c \
+      $${SOURCE_PATH}/jdcolor.c \
+      $${SOURCE_PATH}/jddctmgr.c \
+      $${SOURCE_PATH}/jdhuff.c \
+      $${SOURCE_PATH}/jdicc.c \
+      $${SOURCE_PATH}/jdinput.c \
+      $${SOURCE_PATH}/jdmainct.c \
+      $${SOURCE_PATH}/jdmarker.c \
+      $${SOURCE_PATH}/jdmaster.c \
+      $${SOURCE_PATH}/jdmerge.c \
+      $${SOURCE_PATH}/jdphuff.c \
+      $${SOURCE_PATH}/jdpostct.c \
+      $${SOURCE_PATH}/jdsample.c \
+      $${SOURCE_PATH}/jdtrans.c \
+      $${SOURCE_PATH}/jerror.c \
+      $${SOURCE_PATH}/jfdctflt.c \
+      $${SOURCE_PATH}/jfdctfst.c \
+      $${SOURCE_PATH}/jfdctint.c \
+      $${SOURCE_PATH}/jidctflt.c \
+      $${SOURCE_PATH}/jidctfst.c \
+      $${SOURCE_PATH}/jidctint.c \
+      $${SOURCE_PATH}/jidctred.c \
+      $${SOURCE_PATH}/jmemmgr.c \
+      $${SOURCE_PATH}/jmemnobs.c \
+      $${SOURCE_PATH}/jquant1.c \
+      $${SOURCE_PATH}/jquant2.c \
+      $${SOURCE_PATH}/jutils.c \
+      $${SOURCE_PATH}/jsimd_none.c
+
+INCLUDEPATH += \
+    ../../../../../../../third_party/libjpeg-turbo

tools/qt/simulator/third_party/libjpeg/libjpeg.pro

-CONFIG -= qt
-
-TEMPLATE = lib
-
-CONFIG += c++11
-
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-DESTDIR = ../../libs
-
-SOURCES += \
-    ../../../../../../../../third_party/libjpeg/cdjpeg.c \
-    ../../../../../../../../third_party/libjpeg/jaricom.c \
-    ../../../../../../../../third_party/libjpeg/jcapimin.c \
-    ../../../../../../../../third_party/libjpeg/jcapistd.c \
-    ../../../../../../../../third_party/libjpeg/jcarith.c \
-    ../../../../../../../../third_party/libjpeg/jccoefct.c \
-    ../../../../../../../../third_party/libjpeg/jccolor.c \
-    ../../../../../../../../third_party/libjpeg/jcdctmgr.c \
-    ../../../../../../../../third_party/libjpeg/jchuff.c \
-    ../../../../../../../../third_party/libjpeg/jcinit.c \
-    ../../../../../../../../third_party/libjpeg/jcmainct.c \
-    ../../../../../../../../third_party/libjpeg/jcmarker.c \
-    ../../../../../../../../third_party/libjpeg/jcmaster.c \
-    ../../../../../../../../third_party/libjpeg/jcomapi.c \
-    ../../../../../../../../third_party/libjpeg/jcparam.c \
-    ../../../../../../../../third_party/libjpeg/jcprepct.c \
-    ../../../../../../../../third_party/libjpeg/jcsample.c \
-    ../../../../../../../../third_party/libjpeg/jctrans.c \
-    ../../../../../../../../third_party/libjpeg/jdapimin.c \
-    ../../../../../../../../third_party/libjpeg/jdapistd.c \
-    ../../../../../../../../third_party/libjpeg/jdarith.c \
-    ../../../../../../../../third_party/libjpeg/jdatadst.c \
-    ../../../../../../../../third_party/libjpeg/jdatasrc.c \
-    ../../../../../../../../third_party/libjpeg/jdcoefct.c \
-    ../../../../../../../../third_party/libjpeg/jdcolor.c \
-    ../../../../../../../../third_party/libjpeg/jddctmgr.c \
-    ../../../../../../../../third_party/libjpeg/jdhuff.c \
-    ../../../../../../../../third_party/libjpeg/jdinput.c \
-    ../../../../../../../../third_party/libjpeg/jdmainct.c \
-    ../../../../../../../../third_party/libjpeg/jdmarker.c \
-    ../../../../../../../../third_party/libjpeg/jdmaster.c \
-    ../../../../../../../../third_party/libjpeg/jdmerge.c \
-    ../../../../../../../../third_party/libjpeg/jdpostct.c \
-    ../../../../../../../../third_party/libjpeg/jdsample.c \
-    ../../../../../../../../third_party/libjpeg/jdtrans.c \
-    ../../../../../../../../third_party/libjpeg/jerror.c \
-    ../../../../../../../../third_party/libjpeg/jfdctflt.c \
-    ../../../../../../../../third_party/libjpeg/jfdctfst.c \
-    ../../../../../../../../third_party/libjpeg/jfdctint.c \
-    ../../../../../../../../third_party/libjpeg/jidctflt.c \
-    ../../../../../../../../third_party/libjpeg/jidctfst.c \
-    ../../../../../../../../third_party/libjpeg/jidctint.c \
-    ../../../../../../../../third_party/libjpeg/jmemmgr.c \
-    ../../../../../../../../third_party/libjpeg/jmemnobs.c \
-    ../../../../../../../../third_party/libjpeg/jquant1.c \
-    ../../../../../../../../third_party/libjpeg/jquant2.c \
-    ../../../../../../../../third_party/libjpeg/jutils.c \
-    ../../../../../../../../third_party/libjpeg/rdbmp.c \
-    ../../../../../../../../third_party/libjpeg/rdcolmap.c \
-    ../../../../../../../../third_party/libjpeg/rdgif.c \
-    ../../../../../../../../third_party/libjpeg/rdppm.c \
-    ../../../../../../../../third_party/libjpeg/rdrle.c \
-    ../../../../../../../../third_party/libjpeg/rdswitch.c \
-    ../../../../../../../../third_party/libjpeg/rdtarga.c \
-    ../../../../../../../../third_party/libjpeg/transupp.c
-
-INCLUDEPATH += \
-    ../../../../../../../third_party/libjpeg