import global libs correctly

This commit is contained in:
Aleksandr Karpinskii 2024-09-15 15:36:27 +02:00 committed by Александр Карпинский
parent bd03721816
commit 517c3e1c7f
5 changed files with 8 additions and 13 deletions

View File

@ -72,11 +72,11 @@
*/ */
#ifdef HAVE_LIBJPEG #ifdef HAVE_LIBJPEG
#include "jconfig.h" #include <jconfig.h>
#endif #endif
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
#include "zlib.h" #include <zlib.h>
#endif #endif
#ifdef HAVE_LIBTIFF #ifdef HAVE_LIBTIFF
@ -85,8 +85,6 @@
#include "libImaging/Imaging.h" #include "libImaging/Imaging.h"
#include <stddef.h>
#undef VERBOSE #undef VERBOSE
#define B16(p, i) ((((int)p[(i)]) << 8) + p[(i) + 1]) #define B16(p, i) ((((int)p[(i)]) << 8) + p[(i) + 1])

View File

@ -28,20 +28,18 @@
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
#ifdef _WIN64 #ifdef _WIN64
#define F_HANDLE "K" #define F_HANDLE "K"
#else #else
#define F_HANDLE "k" #define F_HANDLE "k"
#endif #endif
#endif /* _WIN32 */ #endif /* _WIN32 */
#include <stdint.h>
/* We have to define types instead of using typedef because the JPEG lib also /* We have to define types instead of using typedef because the JPEG lib also
defines their own types with the same names, so we need to be able to undef defines their own types with the same names, so we need to be able to undef
ours before including the JPEG code. */ ours before including the JPEG code. */
#include <stdint.h>
#define INT8 int8_t #define INT8 int8_t
#define UINT8 uint8_t #define UINT8 uint8_t
#define INT16 int16_t #define INT16 int16_t

View File

@ -17,7 +17,6 @@
#ifdef HAVE_OPENJPEG #ifdef HAVE_OPENJPEG
#include <stdlib.h>
#include "Jpeg2K.h" #include "Jpeg2K.h"
typedef struct { typedef struct {

View File

@ -8,15 +8,15 @@
* *
*/ */
#ifdef HAVE_LIBIMAGEQUANT
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <libimagequant.h>
#include "QuantPngQuant.h" #include "QuantPngQuant.h"
#ifdef HAVE_LIBIMAGEQUANT
#include "libimagequant.h"
int int
quantize_pngquant( quantize_pngquant(
Pixel *pixelData, Pixel *pixelData,

View File

@ -7,7 +7,7 @@
* Copyright (c) Fredrik Lundh 1996. * Copyright (c) Fredrik Lundh 1996.
*/ */
#include "zlib.h" #include <zlib.h>
/* modes */ /* modes */
#define ZIP_PNG 0 /* continuous, filtered image data */ #define ZIP_PNG 0 /* continuous, filtered image data */