ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch

   1 diff --git a/Source/FreeImage.h b/Source/FreeImage.h
   2 index 12182cd..ebd0453 100644
   3 --- a/Source/FreeImage.h
   4 +++ b/Source/FreeImage.h
   5 @@ -410,16 +410,20 @@ FI_ENUM(FREE_IMAGE_FORMAT) {
   6         FIF_DDS         = 24,
   7         FIF_GIF     = 25,
   8         FIF_HDR         = 26,
   9 -       FIF_FAXG3       = 27,
  10 -       FIF_SGI         = 28,
  11 -       FIF_EXR         = 29,
  12 -       FIF_J2K         = 30,
  13 -       FIF_JP2         = 31,
  14 -       FIF_PFM         = 32,
  15 -       FIF_PICT        = 33,
  16 -       FIF_RAW         = 34,
  17 -       FIF_WEBP        = 35,
  18 -       FIF_JXR         = 36
  19 +/* vcpkg: The G3 fax format plugin is deliberately disabled in our build of
  20 +   FreeImage, since it requires usage of the vendored copy of libtiff. */
  21 +#if 0
  22 +       FIF_FAXG3       = 27,
  23 +#endif
  24 +       FIF_SGI         = 27,
  25 +       FIF_EXR         = 28,
  26 +       FIF_J2K         = 29,
  27 +       FIF_JP2         = 30,
  28 +       FIF_PFM         = 31,
  29 +       FIF_PICT        = 32,
  30 +       FIF_RAW         = 33,
  31 +       FIF_WEBP        = 34,
  32 +       FIF_JXR         = 35
  33  };
  34
  35  /** Image type used in FreeImage.
  36 @@ -476,6 +480,9 @@ FI_ENUM(FREE_IMAGE_DITHER) {
  37  /** Lossless JPEG transformations
  38  Constants used in FreeImage_JPEGTransform
  39  */
  40 +/* vcpkg: The JPEGTransform functions are deliberately disabled in our build
  41 +   of FreeImage, since they require usage of the vendored copy of libjpeg. */
  42 +#if 0
  43  FI_ENUM(FREE_IMAGE_JPEG_OPERATION) {
  44         FIJPEG_OP_NONE                  = 0,    //! no transformation
  45         FIJPEG_OP_FLIP_H                = 1,    //! horizontal flip
  46 @@ -486,6 +493,7 @@ FI_ENUM(FREE_IMAGE_JPEG_OPERATION) {
  47         FIJPEG_OP_ROTATE_180    = 6,    //! 180-degree rotation
  48         FIJPEG_OP_ROTATE_270    = 7             //! 270-degree clockwise (or 90 ccw)
  49  };
  50 +#endif
  51
  52  /** Tone mapping operators.
  53  Constants used in FreeImage_ToneMapping.
  54 @@ -1089,6 +1097,9 @@ DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model,
  55  // JPEG lossless transformation routines
  56  // --------------------------------------------------------------------------
  57
  58 +/* vcpkg: The JPEGTransform functions are deliberately disabled in our build
  59 +   of FreeImage, since they require usage of the vendored copy of libjpeg. */
  60 +#if 0
  61  DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
  62  DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
  63  DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom);
  64 @@ -1097,7 +1108,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io,
  65  DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
  66  DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
  67  DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
  68 -
  69 +#endif
  70
  71  // --------------------------------------------------------------------------
  72  // Image manipulation toolkit
  73 diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp
  74 index 11e7294..0119ba7 100644
  75 --- a/Source/FreeImage/Plugin.cpp
  76 +++ b/Source/FreeImage/Plugin.cpp
  77 @@ -263,7 +263,11 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
  78                         s_plugins->AddNode(InitDDS);
  79                 s_plugins->AddNode(InitGIF);
  80                 s_plugins->AddNode(InitHDR);
  81 -                       s_plugins->AddNode(InitG3);
  82 +/* vcpkg: The G3 fax format plugin is deliberately disabled in our build of FreeImage
  83 ++   since it requires usage of the vendored copy of libtiff. */
  84 +#if 0
  85 +                       s_plugins->AddNode(InitG3);
  86 +#endif
  87                         s_plugins->AddNode(InitSGI);
  88                         s_plugins->AddNode(InitEXR);
  89                         s_plugins->AddNode(InitJ2K);