diff options
Diffstat (limited to 'libs')
33 files changed, 249 insertions, 249 deletions
diff --git a/libs/freeimage/src/FreeImage.h b/libs/freeimage/src/FreeImage.h index c96e579963..2e9c658519 100644 --- a/libs/freeimage/src/FreeImage.h +++ b/libs/freeimage/src/FreeImage.h @@ -153,7 +153,7 @@ FI_STRUCT (FIMULTIBITMAP) { void *data; }; typedef int32_t BOOL; typedef uint8_t uint8_t; typedef uint16_t uint16_t; -typedef uint32_t DWORD; +typedef uint32_t uint32_t; typedef int32_t LONG; typedef int64_t INT64; typedef uint64_t UINT64; @@ -162,7 +162,7 @@ typedef uint64_t UINT64; typedef long BOOL; typedef unsigned char uint8_t; typedef unsigned short uint16_t; -typedef unsigned long DWORD; +typedef unsigned long uint32_t; typedef long LONG; typedef signed __int64 INT64; typedef unsigned __int64 UINT64; @@ -206,17 +206,17 @@ typedef struct tagRGBTRIPLE { #endif // WIN32 typedef struct tagBITMAPINFOHEADER{ - DWORD biSize; + uint32_t biSize; LONG biWidth; LONG biHeight; uint16_t biPlanes; uint16_t biBitCount; - DWORD biCompression; - DWORD biSizeImage; + uint32_t biCompression; + uint32_t biSizeImage; LONG biXPelsPerMeter; LONG biYPelsPerMeter; - DWORD biClrUsed; - DWORD biClrImportant; + uint32_t biClrUsed; + uint32_t biClrImportant; } BITMAPINFOHEADER, *PBITMAPINFOHEADER; typedef struct tagBITMAPINFO { @@ -372,7 +372,7 @@ typedef struct tagFICOMPLEX { FI_STRUCT (FIICCPROFILE) { uint16_t flags; //! info flag - DWORD size; //! profile's size measured in bytes + uint32_t size; //! profile's size measured in bytes void *data; //! points to a block of contiguous memory containing the profile }; @@ -832,13 +832,13 @@ DLL_API void DLL_CALLCONV FreeImage_CorrectBitmap32Alpha(HBITMAP hBitmap, BOOL f DLL_API BOOL DLL_CALLCONV FreeImage_Premultiply(HBITMAP hBitmap); // Memory I/O stream routines ----------------------------------------------- -DLL_API FIMEMORY *DLL_CALLCONV FreeImage_OpenMemory(uint8_t *data FI_DEFAULT(0), DWORD size_in_bytes FI_DEFAULT(0)); +DLL_API FIMEMORY *DLL_CALLCONV FreeImage_OpenMemory(uint8_t *data FI_DEFAULT(0), uint32_t size_in_bytes FI_DEFAULT(0)); DLL_API void DLL_CALLCONV FreeImage_CloseMemory(FIMEMORY *stream); DLL_API FIBITMAP *DLL_CALLCONV FreeImage_LoadFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int flags FI_DEFAULT(0)); DLL_API BOOL DLL_CALLCONV FreeImage_SaveToMemory(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FIMEMORY *stream, int flags FI_DEFAULT(0)); DLL_API long DLL_CALLCONV FreeImage_TellMemory(FIMEMORY *stream); DLL_API BOOL DLL_CALLCONV FreeImage_SeekMemory(FIMEMORY *stream, long offset, int origin); -DLL_API BOOL DLL_CALLCONV FreeImage_AcquireMemory(FIMEMORY *stream, uint8_t **data, DWORD *size_in_bytes); +DLL_API BOOL DLL_CALLCONV FreeImage_AcquireMemory(FIMEMORY *stream, uint8_t **data, uint32_t *size_in_bytes); DLL_API unsigned DLL_CALLCONV FreeImage_ReadMemory(void *buffer, unsigned size, unsigned count, FIMEMORY *stream); DLL_API unsigned DLL_CALLCONV FreeImage_WriteMemory(const void *buffer, unsigned size, unsigned count, FIMEMORY *stream); @@ -1044,11 +1044,11 @@ DLL_API FIBITMAP *DLL_CALLCONV FreeImage_TmoFattal02(FIBITMAP *src, double color // ZLib interface ----------------------------------------------------------- -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCompress(uint8_t *target, DWORD target_size, uint8_t *source, DWORD source_size); -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibUncompress(uint8_t *target, DWORD target_size, uint8_t *source, DWORD source_size); -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGZip(uint8_t *target, DWORD target_size, uint8_t *source, DWORD source_size); -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibGUnzip(uint8_t *target, DWORD target_size, uint8_t *source, DWORD source_size); -DLL_API DWORD DLL_CALLCONV FreeImage_ZLibCRC32(DWORD crc, uint8_t *source, DWORD source_size); +DLL_API uint32_t DLL_CALLCONV FreeImage_ZLibCompress(uint8_t *target, uint32_t target_size, uint8_t *source, uint32_t source_size); +DLL_API uint32_t DLL_CALLCONV FreeImage_ZLibUncompress(uint8_t *target, uint32_t target_size, uint8_t *source, uint32_t source_size); +DLL_API uint32_t DLL_CALLCONV FreeImage_ZLibGZip(uint8_t *target, uint32_t target_size, uint8_t *source, uint32_t source_size); +DLL_API uint32_t DLL_CALLCONV FreeImage_ZLibGUnzip(uint8_t *target, uint32_t target_size, uint8_t *source, uint32_t source_size); +DLL_API uint32_t DLL_CALLCONV FreeImage_ZLibCRC32(uint32_t crc, uint8_t *source, uint32_t source_size); // -------------------------------------------------------------------------- // Metadata routines @@ -1064,16 +1064,16 @@ DLL_API const char *DLL_CALLCONV FreeImage_GetTagKey(FITAG *tag); DLL_API const char *DLL_CALLCONV FreeImage_GetTagDescription(FITAG *tag); DLL_API uint16_t DLL_CALLCONV FreeImage_GetTagID(FITAG *tag); DLL_API FREE_IMAGE_MDTYPE DLL_CALLCONV FreeImage_GetTagType(FITAG *tag); -DLL_API DWORD DLL_CALLCONV FreeImage_GetTagCount(FITAG *tag); -DLL_API DWORD DLL_CALLCONV FreeImage_GetTagLength(FITAG *tag); +DLL_API uint32_t DLL_CALLCONV FreeImage_GetTagCount(FITAG *tag); +DLL_API uint32_t DLL_CALLCONV FreeImage_GetTagLength(FITAG *tag); DLL_API const void *DLL_CALLCONV FreeImage_GetTagValue(FITAG *tag); DLL_API BOOL DLL_CALLCONV FreeImage_SetTagKey(FITAG *tag, const char *key); DLL_API BOOL DLL_CALLCONV FreeImage_SetTagDescription(FITAG *tag, const char *description); DLL_API BOOL DLL_CALLCONV FreeImage_SetTagID(FITAG *tag, uint16_t id); DLL_API BOOL DLL_CALLCONV FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type); -DLL_API BOOL DLL_CALLCONV FreeImage_SetTagCount(FITAG *tag, DWORD count); -DLL_API BOOL DLL_CALLCONV FreeImage_SetTagLength(FITAG *tag, DWORD length); +DLL_API BOOL DLL_CALLCONV FreeImage_SetTagCount(FITAG *tag, uint32_t count); +DLL_API BOOL DLL_CALLCONV FreeImage_SetTagLength(FITAG *tag, uint32_t length); DLL_API BOOL DLL_CALLCONV FreeImage_SetTagValue(FITAG *tag, const void *value); // iterator @@ -1128,7 +1128,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_AdjustGamma(FIBITMAP *dib, double gamma); DLL_API BOOL DLL_CALLCONV FreeImage_AdjustBrightness(FIBITMAP *dib, double percentage); DLL_API BOOL DLL_CALLCONV FreeImage_AdjustContrast(FIBITMAP *dib, double percentage); DLL_API BOOL DLL_CALLCONV FreeImage_Invert(FIBITMAP *dib); -DLL_API BOOL DLL_CALLCONV FreeImage_GetHistogram(FIBITMAP *dib, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL channel FI_DEFAULT(FICC_BLACK)); +DLL_API BOOL DLL_CALLCONV FreeImage_GetHistogram(FIBITMAP *dib, uint32_t *histo, FREE_IMAGE_COLOR_CHANNEL channel FI_DEFAULT(FICC_BLACK)); DLL_API int DLL_CALLCONV FreeImage_GetAdjustColorsLookupTable(uint8_t *LUT, double brightness, double contrast, double gamma, BOOL invert); DLL_API BOOL DLL_CALLCONV FreeImage_AdjustColors(FIBITMAP *dib, double brightness, double contrast, double gamma, BOOL invert FI_DEFAULT(FALSE)); DLL_API unsigned DLL_CALLCONV FreeImage_ApplyColorMapping(FIBITMAP *dib, RGBQUAD *srccolors, RGBQUAD *dstcolors, unsigned count, BOOL ignore_alpha, BOOL swap); diff --git a/libs/freeimage/src/FreeImage/BitmapAccess.cpp b/libs/freeimage/src/FreeImage/BitmapAccess.cpp index 62a1d216aa..b8a0aca68e 100644 --- a/libs/freeimage/src/FreeImage/BitmapAccess.cpp +++ b/libs/freeimage/src/FreeImage/BitmapAccess.cpp @@ -39,7 +39,7 @@ Constants for the BITMAPINFOHEADER::biCompression field BI_RGB: The bitmap is in uncompressed red green blue (RGB) format that is not compressed and does not use color masks. BI_BITFIELDS: -The bitmap is not compressed and the color table consists of three DWORD color masks that specify the red, green, and blue components, +The bitmap is not compressed and the color table consists of three uint32_t color masks that specify the red, green, and blue components, respectively, of each pixel. This is valid when used with 16 and 32-bits per pixel bitmaps. */ #ifndef _WINGDI_ @@ -214,7 +214,7 @@ FreeImage_GetInternalImageSize(BOOL header_only, unsigned width, unsigned height dib_size += sizeof(RGBQUAD) * CalculateUsedPaletteEntries(bpp); // we both add palette size and masks size if need_masks is true, since CalculateUsedPaletteEntries // always returns 0 if need_masks is true (which is only true for 16 bit images). - dib_size += need_masks ? sizeof(DWORD) * 3 : 0; + dib_size += need_masks ? sizeof(uint32_t) * 3 : 0; dib_size += (dib_size % FIBITMAP_ALIGNMENT ? FIBITMAP_ALIGNMENT - dib_size % FIBITMAP_ALIGNMENT : 0); if(!header_only) { @@ -332,7 +332,7 @@ FreeImage_AllocateBitmap(BOOL header_only, uint8_t *ext_bits, unsigned ext_pitch bpp = 8 * sizeof(short); break; case FIT_UINT32: - bpp = 8 * sizeof(DWORD); + bpp = 8 * sizeof(uint32_t); break; case FIT_INT32: bpp = 8 * sizeof(LONG); @@ -647,7 +647,7 @@ FreeImage_GetBits(FIBITMAP *dib) { // returns the pixels aligned on a FIBITMAP_ALIGNMENT bytes alignment boundary size_t lp = (size_t)FreeImage_GetInfoHeader(dib); lp += sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * FreeImage_GetColorsUsed(dib); - lp += FreeImage_HasRGBMasks(dib) ? sizeof(DWORD) * 3 : 0; + lp += FreeImage_HasRGBMasks(dib) ? sizeof(uint32_t) * 3 : 0; lp += (lp % FIBITMAP_ALIGNMENT ? FIBITMAP_ALIGNMENT - lp % FIBITMAP_ALIGNMENT : 0); return (uint8_t *)lp; } @@ -1467,7 +1467,7 @@ FreeImage_SetMetadataKeyValue(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const cha if(tag) { BOOL bSuccess = TRUE; // fill the tag - DWORD tag_length = (DWORD)(strlen(value) + 1); + uint32_t tag_length = (uint32_t)(strlen(value) + 1); bSuccess &= FreeImage_SetTagKey(tag, key); bSuccess &= FreeImage_SetTagLength(tag, tag_length); bSuccess &= FreeImage_SetTagCount(tag, tag_length); diff --git a/libs/freeimage/src/FreeImage/Conversion32.cpp b/libs/freeimage/src/FreeImage/Conversion32.cpp index 52b85d097d..f4da186dd4 100644 --- a/libs/freeimage/src/FreeImage/Conversion32.cpp +++ b/libs/freeimage/src/FreeImage/Conversion32.cpp @@ -106,7 +106,7 @@ FreeImage_ConvertLine16To32_565(uint8_t *target, uint8_t *source, int width_in_p void DLL_CALLCONV FreeImage_ConvertLine24To32(uint8_t *target, uint8_t *source, int width_in_pixels) { for (int cols = 0; cols < width_in_pixels; cols++) { - *(DWORD *)target = (*(DWORD *) source & FI_RGBA_RGB_MASK) | FI_RGBA_ALPHA_MASK; + *(uint32_t *)target = (*(uint32_t *) source & FI_RGBA_RGB_MASK) | FI_RGBA_ALPHA_MASK; target += 4; source += 3; } diff --git a/libs/freeimage/src/FreeImage/ConversionType.cpp b/libs/freeimage/src/FreeImage/ConversionType.cpp index be2000ce33..ff46d9041f 100644 --- a/libs/freeimage/src/FreeImage/ConversionType.cpp +++ b/libs/freeimage/src/FreeImage/ConversionType.cpp @@ -182,7 +182,7 @@ CONVERT_TO_COMPLEX<Tsrc>::convert(FIBITMAP *src) { // Convert from type uint8_t to type X CONVERT_TYPE<unsigned short, uint8_t> convertByteToUShort; CONVERT_TYPE<short, uint8_t> convertByteToShort; -CONVERT_TYPE<DWORD, uint8_t> convertByteToULong; +CONVERT_TYPE<uint32_t, uint8_t> convertByteToULong; CONVERT_TYPE<LONG, uint8_t> convertByteToLong; CONVERT_TYPE<float, uint8_t> convertByteToFloat; CONVERT_TYPE<double, uint8_t> convertByteToDouble; @@ -190,7 +190,7 @@ CONVERT_TYPE<double, uint8_t> convertByteToDouble; // Convert from type X to type uint8_t CONVERT_TO_BYTE<unsigned short> convertUShortToByte; CONVERT_TO_BYTE<short> convertShortToByte; -CONVERT_TO_BYTE<DWORD> convertULongToByte; +CONVERT_TO_BYTE<uint32_t> convertULongToByte; CONVERT_TO_BYTE<LONG> convertLongToByte; CONVERT_TO_BYTE<float> convertFloatToByte; CONVERT_TO_BYTE<double> convertDoubleToByte; @@ -198,13 +198,13 @@ CONVERT_TO_BYTE<double> convertDoubleToByte; // Convert from type X to type float CONVERT_TYPE<float, unsigned short> convertUShortToFloat; CONVERT_TYPE<float, short> convertShortToFloat; -CONVERT_TYPE<float, DWORD> convertULongToFloat; +CONVERT_TYPE<float, uint32_t> convertULongToFloat; CONVERT_TYPE<float, LONG> convertLongToFloat; // Convert from type X to type double CONVERT_TYPE<double, unsigned short> convertUShortToDouble; CONVERT_TYPE<double, short> convertShortToDouble; -CONVERT_TYPE<double, DWORD> convertULongToDouble; +CONVERT_TYPE<double, uint32_t> convertULongToDouble; CONVERT_TYPE<double, LONG> convertLongToDouble; CONVERT_TYPE<double, float> convertFloatToDouble; @@ -212,7 +212,7 @@ CONVERT_TYPE<double, float> convertFloatToDouble; CONVERT_TO_COMPLEX<uint8_t> convertByteToComplex; CONVERT_TO_COMPLEX<unsigned short> convertUShortToComplex; CONVERT_TO_COMPLEX<short> convertShortToComplex; -CONVERT_TO_COMPLEX<DWORD> convertULongToComplex; +CONVERT_TO_COMPLEX<uint32_t> convertULongToComplex; CONVERT_TO_COMPLEX<LONG> convertLongToComplex; CONVERT_TO_COMPLEX<float> convertFloatToComplex; CONVERT_TO_COMPLEX<double> convertDoubleToComplex; diff --git a/libs/freeimage/src/FreeImage/FreeImage.cpp b/libs/freeimage/src/FreeImage/FreeImage.cpp index e2709853ec..3c2e178154 100644 --- a/libs/freeimage/src/FreeImage/FreeImage.cpp +++ b/libs/freeimage/src/FreeImage/FreeImage.cpp @@ -33,7 +33,7 @@ static const char *s_copyright = "This program uses FreeImage, a free, open sour #ifndef FREEIMAGE_LIB BOOL APIENTRY -DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { +DllMain(HANDLE hModule, uint32_t ul_reason_for_call, LPVOID lpReserved) { switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH : FreeImage_Initialise(FALSE); @@ -89,7 +89,7 @@ FreeImage_GetCopyrightMessage() { BOOL DLL_CALLCONV FreeImage_IsLittleEndian() { union { - DWORD i; + uint32_t i; uint8_t c[4]; } u; u.i = 1; diff --git a/libs/freeimage/src/FreeImage/MNGHelper.cpp b/libs/freeimage/src/FreeImage/MNGHelper.cpp index 865cbe38c7..de25e7f0ed 100644 --- a/libs/freeimage/src/FreeImage/MNGHelper.cpp +++ b/libs/freeimage/src/FreeImage/MNGHelper.cpp @@ -53,7 +53,7 @@ http://libpng.org/pub/mng/spec/ #define JNG_SUPPORTED /** Size of a JDAT chunk on writing */ -const DWORD JPEG_CHUNK_SIZE = 8192; +const uint32_t JPEG_CHUNK_SIZE = 8192; /** PNG signature */ static const uint8_t g_png_signature[8] = { 137, 80, 78, 71, 13, 10, 26, 10 }; @@ -248,7 +248,7 @@ mng_SwapShort(uint16_t *sp) { } inline void -mng_SwapLong(DWORD *lp) { +mng_SwapLong(uint32_t *lp) { #ifndef FREEIMAGE_BIGENDIAN SwapLong(lp); #endif @@ -281,7 +281,7 @@ mng_CountPNGChunks(FreeImageIO *io, fi_handle handle, long inPos, unsigned *m_To long mLOF; long mPos; BOOL mEnd = FALSE; - DWORD mLength = 0; + uint32_t mLength = 0; uint8_t mChunkName[5]; *m_TotalBytesOfChunks = 0; @@ -355,11 +355,11 @@ Retrieve the position of a chunk in a PNG stream @return Returns TRUE if successful, returns FALSE otherwise */ static BOOL -mng_FindChunk(FIMEMORY *hPngMemory, uint8_t *chunk_name, long offset, DWORD *start_pos, DWORD *next_pos) { - DWORD mLength = 0; +mng_FindChunk(FIMEMORY *hPngMemory, uint8_t *chunk_name, long offset, uint32_t *start_pos, uint32_t *next_pos) { + uint32_t mLength = 0; uint8_t *data = NULL; - DWORD size_in_bytes = 0; + uint32_t size_in_bytes = 0; *start_pos = 0; *next_pos = 0; @@ -374,7 +374,7 @@ mng_FindChunk(FIMEMORY *hPngMemory, uint8_t *chunk_name, long offset, DWORD *sta try { // skip the signature and/or any following chunk(s) - DWORD chunk_pos = offset; + uint32_t chunk_pos = offset; while(1) { // get chunk length @@ -386,7 +386,7 @@ mng_FindChunk(FIMEMORY *hPngMemory, uint8_t *chunk_name, long offset, DWORD *sta mng_SwapLong(&mLength); chunk_pos += 4; - const DWORD next_chunk_pos = chunk_pos + 4 + mLength + 4; + const uint32_t next_chunk_pos = chunk_pos + 4 + mLength + 4; if(next_chunk_pos > size_in_bytes) { break; } @@ -417,12 +417,12 @@ Remove a chunk located at (start_pos, next_pos) in the PNG stream @return Returns TRUE if successfull, returns FALSE otherwise */ static BOOL -mng_CopyRemoveChunks(FIMEMORY *hPngMemory, DWORD start_pos, DWORD next_pos) { +mng_CopyRemoveChunks(FIMEMORY *hPngMemory, uint32_t start_pos, uint32_t next_pos) { uint8_t *data = NULL; - DWORD size_in_bytes = 0; + uint32_t size_in_bytes = 0; // length of the chunk to remove - DWORD chunk_length = next_pos - start_pos; + uint32_t chunk_length = next_pos - start_pos; if(chunk_length == 0) { return TRUE; } @@ -462,12 +462,12 @@ Insert a chunk just before the inNextChunkName chunk @return Returns TRUE if successfull, returns FALSE otherwise */ static BOOL -mng_CopyInsertChunks(FIMEMORY *hPngMemory, uint8_t *inNextChunkName, uint8_t *inInsertChunk, DWORD inChunkLength, DWORD start_pos, DWORD next_pos) { +mng_CopyInsertChunks(FIMEMORY *hPngMemory, uint8_t *inNextChunkName, uint8_t *inInsertChunk, uint32_t inChunkLength, uint32_t start_pos, uint32_t next_pos) { uint8_t *data = NULL; - DWORD size_in_bytes = 0; + uint32_t size_in_bytes = 0; // length of the chunk to check - DWORD chunk_length = next_pos - start_pos; + uint32_t chunk_length = next_pos - start_pos; if(chunk_length == 0) { return TRUE; } @@ -507,8 +507,8 @@ static BOOL mng_RemoveChunk(FIMEMORY *hPngMemory, uint8_t *chunk_name) { BOOL bResult = FALSE; - DWORD start_pos = 0; - DWORD next_pos = 0; + uint32_t start_pos = 0; + uint32_t next_pos = 0; bResult = mng_FindChunk(hPngMemory, chunk_name, 8, &start_pos, &next_pos); if(!bResult) { @@ -527,8 +527,8 @@ static BOOL mng_InsertChunk(FIMEMORY *hPngMemory, uint8_t *inNextChunkName, uint8_t *inInsertChunk, unsigned chunk_length) { BOOL bResult = FALSE; - DWORD start_pos = 0; - DWORD next_pos = 0; + uint32_t start_pos = 0; + uint32_t next_pos = 0; bResult = mng_FindChunk(hPngMemory, inNextChunkName, 8, &start_pos, &next_pos); if(!bResult) { @@ -571,8 +571,8 @@ Write a chunk in a PNG stream from the current position. @param hPngMemory PNG stream handle */ static void -mng_WriteChunk(uint8_t *chunk_name, uint8_t *chunk_data, DWORD length, FIMEMORY *hPngMemory) { - DWORD crc_file = 0; +mng_WriteChunk(uint8_t *chunk_name, uint8_t *chunk_data, uint32_t length, FIMEMORY *hPngMemory) { + uint32_t crc_file = 0; // write a PNG chunk ... // - length mng_SwapLong(&length); @@ -610,7 +610,7 @@ The image is assumed to be a greyscale image. @param hPngMemory Output memory stream */ static void -mng_WritePNGStream(DWORD jng_width, DWORD jng_height, uint8_t jng_alpha_sample_depth, uint8_t *mChunk, DWORD mLength, FIMEMORY *hPngMemory) { +mng_WritePNGStream(uint32_t jng_width, uint32_t jng_height, uint8_t jng_alpha_sample_depth, uint8_t *mChunk, uint32_t mLength, FIMEMORY *hPngMemory) { // PNG grayscale IDAT format uint8_t data[14]; @@ -675,7 +675,7 @@ mng_SetKeyValue(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, const if(tag) { BOOL bSuccess = TRUE; // fill the tag - DWORD tag_length = (DWORD)(strlen(value) + 1); + uint32_t tag_length = (uint32_t)(strlen(value) + 1); bSuccess &= FreeImage_SetTagKey(tag, key); bSuccess &= FreeImage_SetTagLength(tag, tag_length); bSuccess &= FreeImage_SetTagCount(tag, tag_length); @@ -700,18 +700,18 @@ Read a tEXt chunk and extract the key/value pair. @return Returns TRUE if successful, returns FALSE otherwise */ static BOOL -mng_SetMetadata_tEXt(tEXtMAP &key_value_pair, const uint8_t *mChunk, DWORD mLength) { +mng_SetMetadata_tEXt(tEXtMAP &key_value_pair, const uint8_t *mChunk, uint32_t mLength) { std::string key; std::string value; uint8_t *buffer = (uint8_t*)malloc(mLength * sizeof(uint8_t)); if(!buffer) { return FALSE; } - DWORD pos = 0; + uint32_t pos = 0; memset(buffer, 0, mLength * sizeof(uint8_t)); - for(DWORD i = 0; i < mLength; i++) { + for(uint32_t i = 0; i < mLength; i++) { buffer[pos++] = mChunk[i]; if(mChunk[i] == '\0') { if(key.size() == 0) { @@ -744,14 +744,14 @@ Load a FIBITMAP from a MNG or a JNG stream */ FIBITMAP* mng_ReadChunks(int format_id, FreeImageIO *io, fi_handle handle, long Offset, int flags = 0) { - DWORD mLength = 0; + uint32_t mLength = 0; uint8_t mChunkName[5]; uint8_t *mChunk = NULL; - DWORD crc_file; + uint32_t crc_file; long LastOffset; long mOrigPos; uint8_t *PLTE_file_chunk = NULL; // whole PLTE chunk (lentgh, name, array, crc) - DWORD PLTE_file_size = 0; // size of PLTE chunk + uint32_t PLTE_file_size = 0; // size of PLTE chunk BOOL m_HasGlobalPalette = FALSE; // may turn to TRUE in PLTE chunk unsigned m_TotalBytesOfChunks = 0; @@ -763,8 +763,8 @@ mng_ReadChunks(int format_id, FreeImageIO *io, fi_handle handle, long Offset, in FIMEMORY *hIDATMemory = NULL; // --- - DWORD jng_width = 0; - DWORD jng_height = 0; + uint32_t jng_width = 0; + uint32_t jng_height = 0; uint8_t jng_color_type = 0; uint8_t jng_image_sample_depth = 0; uint8_t jng_image_compression_method = 0; @@ -774,17 +774,17 @@ mng_ReadChunks(int format_id, FreeImageIO *io, fi_handle handle, long Offset, in uint8_t jng_alpha_filter_method = 0; uint8_t jng_alpha_interlace_method = 0; - DWORD mng_frame_width = 0; - DWORD mng_frame_height = 0; - DWORD mng_ticks_per_second = 0; - DWORD mng_nominal_layer_count = 0; - DWORD mng_nominal_frame_count = 0; - DWORD mng_nominal_play_time = 0; - DWORD mng_simplicity_profile = 0; + uint32_t mng_frame_width = 0; + uint32_t mng_frame_height = 0; + uint32_t mng_ticks_per_second = 0; + uint32_t mng_nominal_layer_count = 0; + uint32_t mng_nominal_frame_count = 0; + uint32_t mng_nominal_play_time = 0; + uint32_t mng_simplicity_profile = 0; - DWORD res_x = 2835; // 72 dpi - DWORD res_y = 2835; // 72 dpi + uint32_t res_x = 2835; // 72 dpi + uint32_t res_y = 2835; // 72 dpi RGBQUAD rgbBkColor = {0, 0, 0, 0}; uint16_t bk_red, bk_green, bk_blue; BOOL hasBkColor = FALSE; @@ -833,7 +833,7 @@ mng_ReadChunks(int format_id, FreeImageIO *io, fi_handle handle, long Offset, in io->read_proc(&crc_file, 1, sizeof(crc_file), handle); mng_SwapLong(&crc_file); // check crc - DWORD crc_check = FreeImage_ZLibCRC32(0, &mChunkName[0], 4); + uint32_t crc_check = FreeImage_ZLibCRC32(0, &mChunkName[0], 4); crc_check = FreeImage_ZLibCRC32(crc_check, mChunk, mLength); if(crc_check != crc_file) { FreeImage_OutputMessageProc(format_id, "Error while parsing %s chunk: bad CRC", mChunkName); @@ -1014,7 +1014,7 @@ mng_ReadChunks(int format_id, FreeImageIO *io, fi_handle handle, long Offset, in // load the PNG alpha layer if(mHasIDAT) { uint8_t *data = NULL; - DWORD size_in_bytes = 0; + uint32_t size_in_bytes = 0; // get a pointer to the IDAT buffer FreeImage_AcquireMemory(hIDATMemory, &data, &size_in_bytes); @@ -1141,8 +1141,8 @@ Write a FIBITMAP to a JNG stream */ BOOL mng_WriteJNG(int format_id, FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int flags) { - DWORD jng_width = 0; - DWORD jng_height = 0; + uint32_t jng_width = 0; + uint32_t jng_height = 0; uint8_t jng_color_type = 0; uint8_t jng_image_sample_depth = 8; uint8_t jng_image_compression_method = 8; // 8: ISO-10918-1 Huffman-coded baseline JPEG. @@ -1194,8 +1194,8 @@ mng_WriteJNG(int format_id, FreeImageIO *io, FIBITMAP *dib, fi_handle handle, in return FALSE; } - jng_width = (DWORD)FreeImage_GetWidth(dib); - jng_height = (DWORD)FreeImage_GetHeight(dib); + jng_width = (uint32_t)FreeImage_GetWidth(dib); + jng_height = (uint32_t)FreeImage_GetHeight(dib); try { hJngMemory = FreeImage_OpenMemory(); @@ -1232,14 +1232,14 @@ mng_WriteJNG(int format_id, FreeImageIO *io, FIBITMAP *dib, fi_handle handle, in } { uint8_t *jpeg_data = NULL; - DWORD size_in_bytes = 0; + uint32_t size_in_bytes = 0; // get a pointer to the stream buffer FreeImage_AcquireMemory(hJpegMemory, &jpeg_data, &size_in_bytes); // write chunks - for(DWORD k = 0; k < size_in_bytes;) { - DWORD bytes_left = size_in_bytes - k; - DWORD chunk_size = MIN(JPEG_CHUNK_SIZE, bytes_left); + for(uint32_t k = 0; k < size_in_bytes;) { + uint32_t bytes_left = size_in_bytes - k; + uint32_t chunk_size = MIN(JPEG_CHUNK_SIZE, bytes_left); mng_WriteChunk(mng_JDAT, &jpeg_data[k], chunk_size, hJngMemory); k += chunk_size; } @@ -1260,8 +1260,8 @@ mng_WriteJNG(int format_id, FreeImageIO *io, FIBITMAP *dib, fi_handle handle, in // get the IDAT chunk { BOOL bResult = FALSE; - DWORD start_pos = 0; - DWORD next_pos = 0; + uint32_t start_pos = 0; + uint32_t next_pos = 0; long offset = 8; do { @@ -1270,7 +1270,7 @@ mng_WriteJNG(int format_id, FreeImageIO *io, FIBITMAP *dib, fi_handle handle, in if(!bResult) break; uint8_t *png_data = NULL; - DWORD size_in_bytes = 0; + uint32_t size_in_bytes = 0; // get a pointer to the stream buffer FreeImage_AcquireMemory(hPngMemory, &png_data, &size_in_bytes); @@ -1292,7 +1292,7 @@ mng_WriteJNG(int format_id, FreeImageIO *io, FIBITMAP *dib, fi_handle handle, in // write the JNG on output stream { uint8_t *jng_data = NULL; - DWORD size_in_bytes = 0; + uint32_t size_in_bytes = 0; FreeImage_AcquireMemory(hJngMemory, &jng_data, &size_in_bytes); io->write_proc(jng_data, 1, size_in_bytes, handle); } diff --git a/libs/freeimage/src/FreeImage/MemoryIO.cpp b/libs/freeimage/src/FreeImage/MemoryIO.cpp index bcac67d57d..c7b34c090f 100644 --- a/libs/freeimage/src/FreeImage/MemoryIO.cpp +++ b/libs/freeimage/src/FreeImage/MemoryIO.cpp @@ -30,7 +30,7 @@ // ===================================================================== FIMEMORY * DLL_CALLCONV -FreeImage_OpenMemory(uint8_t *data, DWORD size_in_bytes) { +FreeImage_OpenMemory(uint8_t *data, uint32_t size_in_bytes) { // allocate a memory handle FIMEMORY *stream = (FIMEMORY*)malloc(sizeof(FIMEMORY)); if(stream) { @@ -113,7 +113,7 @@ FreeImage_SaveToMemory(FREE_IMAGE_FORMAT fif, FIBITMAP *dib, FIMEMORY *stream, i // ===================================================================== BOOL DLL_CALLCONV -FreeImage_AcquireMemory(FIMEMORY *stream, uint8_t **data, DWORD *size_in_bytes) { +FreeImage_AcquireMemory(FIMEMORY *stream, uint8_t **data, uint32_t *size_in_bytes) { if (stream) { FIMEMORYHEADER *mem_header = (FIMEMORYHEADER*)(stream->data); diff --git a/libs/freeimage/src/FreeImage/MultiPage.cpp b/libs/freeimage/src/FreeImage/MultiPage.cpp index c246692957..2d9affb21e 100644 --- a/libs/freeimage/src/FreeImage/MultiPage.cpp +++ b/libs/freeimage/src/FreeImage/MultiPage.cpp @@ -592,7 +592,7 @@ FreeImage_SavePageToBlock(MULTIBITMAPHEADER *header, FIBITMAP *data) { return res; } - DWORD compressed_size = 0; + uint32_t compressed_size = 0; uint8_t *compressed_data = NULL; // compress the bitmap data @@ -755,7 +755,7 @@ FreeImage_UnlockPage(FIMULTIBITMAP *bitmap, FIBITMAP *page, BOOL changed) { // compress the data - DWORD compressed_size = 0; + uint32_t compressed_size = 0; uint8_t *compressed_data = NULL; // open a memory handle diff --git a/libs/freeimage/src/FreeImage/PluginBMP.cpp b/libs/freeimage/src/FreeImage/PluginBMP.cpp index 8734c51b9b..bdf4dd581c 100644 --- a/libs/freeimage/src/FreeImage/PluginBMP.cpp +++ b/libs/freeimage/src/FreeImage/PluginBMP.cpp @@ -38,7 +38,7 @@ static const uint8_t RLE_DELTA = 2; static const uint8_t BI_ALPHABITFIELDS = 6; // compression: Bit field (this value is valid in Windows CE .NET 4.0 and later) typedef struct tagBITMAPINFOOS2_1X_HEADER { - DWORD biSize; + uint32_t biSize; uint16_t biWidth; uint16_t biHeight; uint16_t biPlanes; @@ -59,14 +59,14 @@ static int s_format_id; static void SwapInfoHeader(BITMAPINFOHEADER *header) { SwapLong(&header->biSize); - SwapLong((DWORD *)&header->biWidth); - SwapLong((DWORD *)&header->biHeight); + SwapLong((uint32_t *)&header->biWidth); + SwapLong((uint32_t *)&header->biHeight); SwapShort(&header->biPlanes); SwapShort(&header->biBitCount); SwapLong(&header->biCompression); SwapLong(&header->biSizeImage); - SwapLong((DWORD *)&header->biXPelsPerMeter); - SwapLong((DWORD *)&header->biYPelsPerMeter); + SwapLong((uint32_t *)&header->biXPelsPerMeter); + SwapLong((uint32_t *)&header->biYPelsPerMeter); SwapLong(&header->biClrUsed); SwapLong(&header->biClrImportant); } @@ -537,8 +537,8 @@ LoadWindowsBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bit else if (type >= 56) use_bitfields = 4; if (use_bitfields > 0) { - DWORD bitfields[4]; - io->read_proc(bitfields, use_bitfields * sizeof(DWORD), 1, handle); + uint32_t bitfields[4]; + io->read_proc(bitfields, use_bitfields * sizeof(uint32_t), 1, handle); dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, bitfields[0], bitfields[1], bitfields[2]); } else { dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, FI16_555_RED_MASK, FI16_555_GREEN_MASK, FI16_555_BLUE_MASK); @@ -577,8 +577,8 @@ LoadWindowsBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bit else if (type >= 56) use_bitfields = 4; if (use_bitfields > 0) { - DWORD bitfields[4]; - io->read_proc(bitfields, use_bitfields * sizeof(DWORD), 1, handle); + uint32_t bitfields[4]; + io->read_proc(bitfields, use_bitfields * sizeof(uint32_t), 1, handle); dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, bitfields[0], bitfields[1], bitfields[2]); } else { if( bit_count == 32 ) { @@ -753,9 +753,9 @@ LoadOS22XBMP(FreeImageIO *io, fi_handle handle, int flags, unsigned bitmap_bits_ case 16 : { if (bih.biCompression == 3) { - DWORD bitfields[3]; + uint32_t bitfields[3]; - io->read_proc(bitfields, 3 * sizeof(DWORD), 1, handle); + io->read_proc(bitfields, 3 * sizeof(uint32_t), 1, handle); dib = FreeImage_AllocateHeader(header_only, width, height, bit_count, bitfields[0], bitfields[1], bitfields[2]); } else { @@ -1051,7 +1051,7 @@ static FIBITMAP * DLL_CALLCONV Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { if (handle != NULL) { BITMAPFILEHEADER bitmapfileheader; - DWORD type = 0; + uint32_t type = 0; // we use this offset value to make seemingly absolute seeks relative in the file @@ -1073,8 +1073,8 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { // read the first byte of the infoheader - io->read_proc(&type, sizeof(DWORD), 1, handle); - io->seek_proc(handle, 0 - (long)sizeof(DWORD), SEEK_CUR); + io->read_proc(&type, sizeof(uint32_t), 1, handle); + io->seek_proc(handle, 0 - (long)sizeof(uint32_t), SEEK_CUR); #ifdef FREEIMAGE_BIGENDIAN SwapLong(&type); #endif @@ -1283,8 +1283,8 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void bool bit_fields = (dst_bpp == 16) ? true : false; if (bit_fields) { - bitmapfileheader.bfSize += 3 * sizeof(DWORD); - bitmapfileheader.bfOffBits += 3 * sizeof(DWORD); + bitmapfileheader.bfSize += 3 * sizeof(uint32_t); + bitmapfileheader.bfOffBits += 3 * sizeof(uint32_t); } #ifdef FREEIMAGE_BIGENDIAN @@ -1321,23 +1321,23 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void // write the bit fields when we are dealing with a 16 bit BMP if (bit_fields) { - DWORD d; + uint32_t d; d = FreeImage_GetRedMask(dib); - if (io->write_proc(&d, sizeof(DWORD), 1, handle) != 1) { + if (io->write_proc(&d, sizeof(uint32_t), 1, handle) != 1) { return FALSE; } d = FreeImage_GetGreenMask(dib); - if (io->write_proc(&d, sizeof(DWORD), 1, handle) != 1) { + if (io->write_proc(&d, sizeof(uint32_t), 1, handle) != 1) { return FALSE; } d = FreeImage_GetBlueMask(dib); - if (io->write_proc(&d, sizeof(DWORD), 1, handle) != 1) { + if (io->write_proc(&d, sizeof(uint32_t), 1, handle) != 1) { return FALSE; } } @@ -1405,7 +1405,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void #if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB } else if (bpp == 24) { int padding = dst_pitch - dst_width * sizeof(FILE_BGR); - DWORD pad = 0; + uint32_t pad = 0; FILE_BGR bgr; for(unsigned y = 0; y < dst_height; y++) { uint8_t *line = FreeImage_GetScanLine(dib, y); diff --git a/libs/freeimage/src/FreeImage/PluginGIF.cpp b/libs/freeimage/src/FreeImage/PluginGIF.cpp index 3ec9a1b280..60ce1fb042 100644 --- a/libs/freeimage/src/FreeImage/PluginGIF.cpp +++ b/libs/freeimage/src/FreeImage/PluginGIF.cpp @@ -144,7 +144,7 @@ static int g_GifInterlaceIncrement[GIF_INTERLACE_PASSES] = {8, 8, 4, 2}; // ========================================================== static BOOL -FreeImage_SetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, uint16_t id, FREE_IMAGE_MDTYPE type, DWORD count, DWORD length, const void *value) +FreeImage_SetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, uint16_t id, FREE_IMAGE_MDTYPE type, uint32_t count, uint32_t length, const void *value) { BOOL bResult = FALSE; FITAG *tag = FreeImage_CreateTag(); @@ -1025,7 +1025,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { } comment.append(1, '\0'); sprintf(buf, "Comment%zd", idx); - DWORD comment_size = (DWORD)comment.size(); + uint32_t comment_size = (uint32_t)comment.size(); FreeImage_SetMetadataEx(FIMD_COMMENTS, dib, buf, 1, FIDT_ASCII, comment_size, comment_size, comment.c_str()); } } diff --git a/libs/freeimage/src/FreeImage/PluginICO.cpp b/libs/freeimage/src/FreeImage/PluginICO.cpp index 96db02ad3c..125e9e2a35 100644 --- a/libs/freeimage/src/FreeImage/PluginICO.cpp +++ b/libs/freeimage/src/FreeImage/PluginICO.cpp @@ -48,8 +48,8 @@ typedef struct tagICONDIRECTORYENTRY { uint8_t bReserved; // reserved uint16_t wPlanes; // color Planes uint16_t wBitCount; // bits per pixel - DWORD dwBytesInRes; // how many bytes in this resource? - DWORD dwImageOffset; // where in the file is this image + uint32_t dwBytesInRes; // how many bytes in this resource? + uint32_t dwImageOffset; // where in the file is this image } ICONDIRENTRY; #ifdef _WIN32 @@ -62,7 +62,7 @@ typedef struct tagICONDIRECTORYENTRY { // Static helpers // ========================================================== -/** How wide, in bytes, would this many bits be, DWORD aligned ? +/** How wide, in bytes, would this many bits be, uint32_t aligned ? */ static int WidthBytes(int bits) { @@ -72,9 +72,9 @@ WidthBytes(int bits) { /** Calculates the size of a single icon image @return Returns the size for that image */ -static DWORD +static uint32_t CalculateImageSize(FIBITMAP* icon_dib) { - DWORD dwNumBytes = 0; + uint32_t dwNumBytes = 0; unsigned colors = FreeImage_GetColorsUsed(icon_dib); unsigned width = FreeImage_GetWidth(icon_dib); @@ -92,14 +92,14 @@ CalculateImageSize(FIBITMAP* icon_dib) { /** Calculates the file offset for an icon image @return Returns the file offset for that image */ -static DWORD +static uint32_t CalculateImageOffset(std::vector<FIBITMAP*>& vPages, int nIndex ) { - DWORD dwSize; + uint32_t dwSize; // calculate the ICO header size dwSize = sizeof(ICONHEADER); // add the ICONDIRENTRY's - dwSize += (DWORD)( vPages.size() * sizeof(ICONDIRENTRY) ); + dwSize += (uint32_t)( vPages.size() * sizeof(ICONDIRENTRY) ); // add the sizes of the previous images for(int k = 0; k < nIndex; k++) { FIBITMAP *icon_dib = (FIBITMAP*)vPages[k]; @@ -130,14 +130,14 @@ IsPNG(FreeImageIO *io, fi_handle handle) { static void SwapInfoHeader(BITMAPINFOHEADER *header) { SwapLong(&header->biSize); - SwapLong((DWORD *)&header->biWidth); - SwapLong((DWORD *)&header->biHeight); + SwapLong((uint32_t *)&header->biWidth); + SwapLong((uint32_t *)&header->biHeight); SwapShort(&header->biPlanes); SwapShort(&header->biBitCount); SwapLong(&header->biCompression); SwapLong(&header->biSizeImage); - SwapLong((DWORD *)&header->biXPelsPerMeter); - SwapLong((DWORD *)&header->biYPelsPerMeter); + SwapLong((uint32_t *)&header->biXPelsPerMeter); + SwapLong((uint32_t *)&header->biYPelsPerMeter); SwapLong(&header->biClrUsed); SwapLong(&header->biClrImportant); } @@ -744,7 +744,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void // write the image bits for each image - DWORD dwImageOffset = (DWORD)io->tell_proc(handle); + uint32_t dwImageOffset = (uint32_t)io->tell_proc(handle); for(k = 0; k < icon_header->idCount; k++) { icon_dib = (FIBITMAP*)vPages[k]; @@ -760,7 +760,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void } // update ICONDIRENTRY members - DWORD dwBytesInRes = (DWORD)io->tell_proc(handle) - dwImageOffset; + uint32_t dwBytesInRes = (uint32_t)io->tell_proc(handle) - dwImageOffset; icon_list[k].dwImageOffset = dwImageOffset; icon_list[k].dwBytesInRes = dwBytesInRes; dwImageOffset += dwBytesInRes; diff --git a/libs/freeimage/src/FreeImage/PluginJPEG.cpp b/libs/freeimage/src/FreeImage/PluginJPEG.cpp index 23c13deef2..68b7b00ffb 100644 --- a/libs/freeimage/src/FreeImage/PluginJPEG.cpp +++ b/libs/freeimage/src/FreeImage/PluginJPEG.cpp @@ -636,8 +636,8 @@ jpeg_read_xmp_profile(FIBITMAP *dib, const uint8_t *dataptr, unsigned int datale if(tag) { FreeImage_SetTagID(tag, JPEG_APP0+1); // 0xFFE1 FreeImage_SetTagKey(tag, g_TagLib_XMPFieldName); - FreeImage_SetTagLength(tag, (DWORD)length); - FreeImage_SetTagCount(tag, (DWORD)length); + FreeImage_SetTagLength(tag, (uint32_t)length); + FreeImage_SetTagCount(tag, (uint32_t)length); FreeImage_SetTagType(tag, FIDT_ASCII); FreeImage_SetTagValue(tag, profile); @@ -882,13 +882,13 @@ jpeg_write_xmp_profile(j_compress_ptr cinfo, FIBITMAP *dib) { // XMP signature is 29 bytes long unsigned int xmp_header_size = (unsigned int)strlen(xmp_signature) + 1; - DWORD tag_length = FreeImage_GetTagLength(tag_xmp); + uint32_t tag_length = FreeImage_GetTagLength(tag_xmp); uint8_t *profile = (uint8_t*)malloc((tag_length + xmp_header_size) * sizeof(uint8_t)); if(profile == NULL) return FALSE; memcpy(profile, xmp_signature, xmp_header_size); - for(DWORD i = 0; i < tag_length; i += 65504L) { + for(uint32_t i = 0; i < tag_length; i += 65504L) { unsigned length = MIN((long)(tag_length - i), 65504L); memcpy(profile + xmp_header_size, tag_value + i, length); @@ -926,12 +926,12 @@ jpeg_write_exif_profile_raw(j_compress_ptr cinfo, FIBITMAP *dib) { } if(NULL != tag_value) { - DWORD tag_length = FreeImage_GetTagLength(tag_exif); + uint32_t tag_length = FreeImage_GetTagLength(tag_exif); uint8_t *profile = (uint8_t*)malloc(tag_length * sizeof(uint8_t)); if(profile == NULL) return FALSE; - for(DWORD i = 0; i < tag_length; i += 65504L) { + for(uint32_t i = 0; i < tag_length; i += 65504L) { unsigned length = MIN((long)(tag_length - i), 65504L); memcpy(profile, tag_value + i, length); @@ -982,14 +982,14 @@ jpeg_write_jfxx(j_compress_ptr cinfo, FIBITMAP *dib) { } uint8_t* thData = NULL; - DWORD thSize = 0; + uint32_t thSize = 0; FreeImage_AcquireMemory(stream, &thData, &thSize); uint8_t id_length = 5; //< "JFXX" uint8_t type = JFXX_TYPE_JPEG; - DWORD totalsize = id_length + sizeof(type) + thSize; + uint32_t totalsize = id_length + sizeof(type) + thSize; jpeg_write_m_header(cinfo, JPEG_APP0, totalsize); jpeg_write_m_byte(cinfo, 'J'); @@ -1065,8 +1065,8 @@ store_size_info(FIBITMAP *dib, JDIMENSION width, JDIMENSION height) { sprintf(buffer, "%d", (int)width); length = strlen(buffer) + 1; // include the NULL/0 value FreeImage_SetTagKey(tag, "OriginalJPEGWidth"); - FreeImage_SetTagLength(tag, (DWORD)length); - FreeImage_SetTagCount(tag, (DWORD)length); + FreeImage_SetTagLength(tag, (uint32_t)length); + FreeImage_SetTagCount(tag, (uint32_t)length); FreeImage_SetTagType(tag, FIDT_ASCII); FreeImage_SetTagValue(tag, buffer); FreeImage_SetMetadata(FIMD_COMMENTS, dib, FreeImage_GetTagKey(tag), tag); @@ -1074,8 +1074,8 @@ store_size_info(FIBITMAP *dib, JDIMENSION width, JDIMENSION height) { sprintf(buffer, "%d", (int)height); length = strlen(buffer) + 1; // include the NULL/0 value FreeImage_SetTagKey(tag, "OriginalJPEGHeight"); - FreeImage_SetTagLength(tag, (DWORD)length); - FreeImage_SetTagCount(tag, (DWORD)length); + FreeImage_SetTagLength(tag, (uint32_t)length); + FreeImage_SetTagCount(tag, (uint32_t)length); FreeImage_SetTagType(tag, FIDT_ASCII); FreeImage_SetTagValue(tag, buffer); FreeImage_SetMetadata(FIMD_COMMENTS, dib, FreeImage_GetTagKey(tag), tag); diff --git a/libs/freeimage/src/FreeImage/PluginPNG.cpp b/libs/freeimage/src/FreeImage/PluginPNG.cpp index 9a00c23e19..a74026d894 100644 --- a/libs/freeimage/src/FreeImage/PluginPNG.cpp +++ b/libs/freeimage/src/FreeImage/PluginPNG.cpp @@ -115,7 +115,7 @@ ReadMetadata(png_structp png_ptr, png_infop info_ptr, FIBITMAP *dib) { tag = FreeImage_CreateTag(); if(!tag) return FALSE; - DWORD tag_length = (DWORD) MAX(text_ptr[i].text_length, text_ptr[i].itxt_length); + uint32_t tag_length = (uint32_t) MAX(text_ptr[i].text_length, text_ptr[i].itxt_length); FreeImage_SetTagLength(tag, tag_length); FreeImage_SetTagCount(tag, tag_length); @@ -147,7 +147,7 @@ ReadMetadata(png_structp png_ptr, png_infop info_ptr, FIBITMAP *dib) { // convert as 'yyyy:MM:dd hh:mm:ss' sprintf(timestamp, "%4d:%02d:%02d %2d:%02d:%02d", mod_time->year, mod_time->month, mod_time->day, mod_time->hour, mod_time->minute, mod_time->second); - DWORD tag_length = (DWORD)strlen(timestamp) + 1; + uint32_t tag_length = (uint32_t)strlen(timestamp) + 1; FreeImage_SetTagLength(tag, tag_length); FreeImage_SetTagCount(tag, tag_length); FreeImage_SetTagType(tag, FIDT_ASCII); diff --git a/libs/freeimage/src/FreeImage/PluginWebP.cpp b/libs/freeimage/src/FreeImage/PluginWebP.cpp index 1e3a265407..cb3a615742 100644 --- a/libs/freeimage/src/FreeImage/PluginWebP.cpp +++ b/libs/freeimage/src/FreeImage/PluginWebP.cpp @@ -383,8 +383,8 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { FITAG *tag = FreeImage_CreateTag(); if(tag) { FreeImage_SetTagKey(tag, g_TagLib_XMPFieldName); - FreeImage_SetTagLength(tag, (DWORD)xmp_metadata.size); - FreeImage_SetTagCount(tag, (DWORD)xmp_metadata.size); + FreeImage_SetTagLength(tag, (uint32_t)xmp_metadata.size); + FreeImage_SetTagCount(tag, (uint32_t)xmp_metadata.size); FreeImage_SetTagType(tag, FIDT_ASCII); FreeImage_SetTagValue(tag, xmp_metadata.bytes); @@ -583,7 +583,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void } // store the blob into the mux uint8_t *data = NULL; - DWORD data_size = 0; + uint32_t data_size = 0; FreeImage_AcquireMemory(hmem, &data, &data_size); webp_image.bytes = data; webp_image.size = data_size; diff --git a/libs/freeimage/src/FreeImage/ZLibInterface.cpp b/libs/freeimage/src/FreeImage/ZLibInterface.cpp index 571777c278..69c8df538a 100644 --- a/libs/freeimage/src/FreeImage/ZLibInterface.cpp +++ b/libs/freeimage/src/FreeImage/ZLibInterface.cpp @@ -36,8 +36,8 @@ which must be at least 0.1% larger than source_size plus 12 bytes. @return Returns the actual size of the compressed buffer, returns 0 if an error occured @see FreeImage_ZLibUncompress */ -DWORD DLL_CALLCONV -FreeImage_ZLibCompress(uint8_t *target, DWORD target_size, uint8_t *source, DWORD source_size) { +uint32_t DLL_CALLCONV +FreeImage_ZLibCompress(uint8_t *target, uint32_t target_size, uint8_t *source, uint32_t source_size) { uLongf dest_len = (uLongf)target_size; int zerr = compress(target, &dest_len, source, source_size); @@ -68,8 +68,8 @@ compression library. @return Returns the actual size of the uncompressed buffer, returns 0 if an error occured @see FreeImage_ZLibCompress */ -DWORD DLL_CALLCONV -FreeImage_ZLibUncompress(uint8_t *target, DWORD target_size, uint8_t *source, DWORD source_size) { +uint32_t DLL_CALLCONV +FreeImage_ZLibUncompress(uint8_t *target, uint32_t target_size, uint8_t *source, uint32_t source_size) { uLongf dest_len = (uLongf)target_size; int zerr = uncompress(target, &dest_len, source, source_size); @@ -99,10 +99,10 @@ which must be at least 0.1% larger than source_size plus 24 bytes. @return Returns the actual size of the compressed buffer, returns 0 if an error occured @see FreeImage_ZLibCompress */ -DWORD DLL_CALLCONV -FreeImage_ZLibGZip(uint8_t *target, DWORD target_size, uint8_t *source, DWORD source_size) { +uint32_t DLL_CALLCONV +FreeImage_ZLibGZip(uint8_t *target, uint32_t target_size, uint8_t *source, uint32_t source_size) { uLongf dest_len = (uLongf)target_size - 12; - DWORD crc = crc32(0L, NULL, 0); + uint32_t crc = crc32(0L, NULL, 0); // set up header (stolen from zlib/gzio.c) sprintf((char *)target, "%c%c%c%c%c%c%c%c", 0x1f, 0x8b, @@ -149,7 +149,7 @@ static int get_byte(z_stream *stream) { static int checkheader(z_stream *stream) { int flags, c; - DWORD len; + uint32_t len; if (get_byte(stream) != 0x1f || get_byte(stream) != 0x8b) return Z_DATA_ERROR; @@ -158,8 +158,8 @@ static int checkheader(z_stream *stream) { for (len = 0; len < 6; len++) (void)get_byte(stream); if ((flags & 0x04) != 0) { /* skip the extra field */ - len = (DWORD)get_byte(stream); - len += ((DWORD)get_byte(stream)) << 8; + len = (uint32_t)get_byte(stream); + len += ((uint32_t)get_byte(stream)) << 8; /* len is garbage if EOF but the loop below will quit anyway */ while (len-- != 0 && get_byte(stream) != EOF) ; } @@ -175,10 +175,10 @@ static int checkheader(z_stream *stream) { return Z_OK; } -DWORD DLL_CALLCONV -FreeImage_ZLibGUnzip(uint8_t *target, DWORD target_size, uint8_t *source, DWORD source_size) { - DWORD src_len = source_size; - DWORD dest_len = target_size; +uint32_t DLL_CALLCONV +FreeImage_ZLibGUnzip(uint8_t *target, uint32_t target_size, uint8_t *source, uint32_t source_size) { + uint32_t src_len = source_size; + uint32_t dest_len = target_size; int zerr = Z_DATA_ERROR; if (src_len > 0) { @@ -216,8 +216,8 @@ If source is NULL, this function returns the required initial value for the crc. @param source_size Size of the source buffer, in bytes @return Returns the new crc value */ -DWORD DLL_CALLCONV -FreeImage_ZLibCRC32(DWORD crc, uint8_t *source, DWORD source_size) { +uint32_t DLL_CALLCONV +FreeImage_ZLibCRC32(uint32_t crc, uint8_t *source, uint32_t source_size) { return crc32(crc, source, source_size); } diff --git a/libs/freeimage/src/FreeImageToolkit/Colors.cpp b/libs/freeimage/src/FreeImageToolkit/Colors.cpp index c32f52fcc3..22dcf4103f 100644 --- a/libs/freeimage/src/FreeImageToolkit/Colors.cpp +++ b/libs/freeimage/src/FreeImageToolkit/Colors.cpp @@ -351,7 +351,7 @@ bit depth is not supported (nothing is done). @return Returns TRUE if succesful, returns FALSE if the image bit depth isn't supported. */ BOOL DLL_CALLCONV -FreeImage_GetHistogram(FIBITMAP *src, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL channel) { +FreeImage_GetHistogram(FIBITMAP *src, uint32_t *histo, FREE_IMAGE_COLOR_CHANNEL channel) { uint8_t pixel; uint8_t *bits = NULL; unsigned x, y; @@ -364,7 +364,7 @@ FreeImage_GetHistogram(FIBITMAP *src, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL cha if(bpp == 8) { // clear histogram array - memset(histo, 0, 256 * sizeof(DWORD)); + memset(histo, 0, 256 * sizeof(uint32_t)); // compute histogram for black channel for(y = 0; y < height; y++) { bits = FreeImage_GetScanLine(src, y); @@ -380,7 +380,7 @@ FreeImage_GetHistogram(FIBITMAP *src, DWORD *histo, FREE_IMAGE_COLOR_CHANNEL cha int bytespp = bpp / 8; // bytes / pixel // clear histogram array - memset(histo, 0, 256 * sizeof(DWORD)); + memset(histo, 0, 256 * sizeof(uint32_t)); switch(channel) { case FICC_RED: diff --git a/libs/freeimage/src/Metadata/Exif.cpp b/libs/freeimage/src/Metadata/Exif.cpp index 1b7dad3916..49a20c75d2 100644 --- a/libs/freeimage/src/Metadata/Exif.cpp +++ b/libs/freeimage/src/Metadata/Exif.cpp @@ -133,9 +133,9 @@ ReadUint16(BOOL msb_order, const void *buffer) { return value; } -static DWORD +static uint32_t ReadUint32(BOOL msb_order, const void *buffer) { - return ((DWORD) ReadInt32(msb_order, buffer) & 0xFFFFFFFF); + return ((uint32_t) ReadInt32(msb_order, buffer) & 0xFFFFFFFF); } // ---------------------------------------------------------- @@ -147,7 +147,7 @@ Process a IFD offset Returns the offset and the metadata model for this tag */ static void -processIFDOffset(FITAG *tag, const char *pval, BOOL msb_order, DWORD *subdirOffset, TagLib::MDMODEL *md_model) { +processIFDOffset(FITAG *tag, const char *pval, BOOL msb_order, uint32_t *subdirOffset, TagLib::MDMODEL *md_model) { // get the IFD offset *subdirOffset = ReadUint32(msb_order, pval); @@ -170,7 +170,7 @@ Process a maker note IFD offset Returns the offset and the metadata model for this tag */ static void -processMakerNote(FIBITMAP *dib, const char *pval, BOOL msb_order, DWORD *subdirOffset, TagLib::MDMODEL *md_model) { +processMakerNote(FIBITMAP *dib, const char *pval, BOOL msb_order, uint32_t *subdirOffset, TagLib::MDMODEL *md_model) { FITAG *tagMake = NULL; *subdirOffset = 0; @@ -243,7 +243,7 @@ processMakerNote(FIBITMAP *dib, const char *pval, BOOL msb_order, DWORD *subdirO // the value of ifdStart will be 0x0c000000 instead of 0x0000000c and the MakerNote section will be discarded later // in jpeg_read_exif_dir because the IFD is too high *md_model = TagLib::EXIF_MAKERNOTE_FUJIFILM; - DWORD ifdStart = ReadUint32(msb_order, pval + 8); + uint32_t ifdStart = ReadUint32(msb_order, pval + 8); *subdirOffset = ifdStart; } else if(memcmp("KYOCERA\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x00\x00\x00", pval, 22) == 0) { @@ -307,7 +307,7 @@ A single Canon tag may contain many other tags within. static BOOL processCanonMakerNoteTag(FIBITMAP *dib, FITAG *tag) { char defaultKey[16]; - DWORD startIndex = 0; + uint32_t startIndex = 0; TagLib& s = TagLib::instance(); uint16_t tag_id = FreeImage_GetTagID(tag); @@ -368,7 +368,7 @@ processCanonMakerNoteTag(FIBITMAP *dib, FITAG *tag) { if(!canonTag) return FALSE; // we intentionally skip the first array member (if needed) - for (DWORD i = startIndex; i < FreeImage_GetTagCount(tag); i++) { + for (uint32_t i = startIndex; i < FreeImage_GetTagCount(tag); i++) { tag_id = (uint16_t)(subTagTypeBase + i); @@ -403,7 +403,7 @@ static void processExifTag(FIBITMAP *dib, FITAG *tag, char *pval, BOOL msb_order, TagLib::MDMODEL md_model) { char defaultKey[16]; int n; - DWORD i; + uint32_t i; // allocate a buffer to store the tag value uint8_t *exif_value = (uint8_t*)malloc(FreeImage_GetTagLength(tag) * sizeof(uint8_t)); @@ -436,9 +436,9 @@ processExifTag(FIBITMAP *dib, FITAG *tag, char *pval, BOOL msb_order, TagLib::MD } case FIDT_LONG: { - DWORD *value = (DWORD*)&exif_value[0]; + uint32_t *value = (uint32_t*)&exif_value[0]; for(i = 0; i < FreeImage_GetTagCount(tag); i++) { - value[i] = ReadUint32(msb_order, pval + i * sizeof(DWORD)); + value[i] = ReadUint32(msb_order, pval + i * sizeof(uint32_t)); } FreeImage_SetTagValue(tag, value); break; @@ -454,9 +454,9 @@ processExifTag(FIBITMAP *dib, FITAG *tag, char *pval, BOOL msb_order, TagLib::MD } case FIDT_RATIONAL: { - n = sizeof(DWORD); + n = sizeof(uint32_t); - DWORD *value = (DWORD*)&exif_value[0]; + uint32_t *value = (uint32_t*)&exif_value[0]; for(i = 0; i < 2 * FreeImage_GetTagCount(tag); i++) { // read a sequence of (numerator, denominator) value[i] = ReadUint32(msb_order, n*i + (char*)pval); @@ -527,7 +527,7 @@ Process Exif directory @return Returns TRUE if sucessful, returns FALSE otherwise */ static BOOL -jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWORD dwLength, DWORD dwProfileOffset, BOOL msb_order, TagLib::MDMODEL starting_md_model) { +jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, uint32_t dwOffsetIfd0, uint32_t dwLength, uint32_t dwProfileOffset, BOOL msb_order, TagLib::MDMODEL starting_md_model) { uint16_t de, nde; std::stack<uint16_t> destack; // directory entries stack @@ -538,7 +538,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR // when recursive/cyclic directory structures exist. // This kind of recursive Exif file was encountered with Kodak images coming from // KODAK PROFESSIONAL DCS Photo Desk JPEG Export v3.2 W - std::map<DWORD, int> visitedIFD; + std::map<uint32_t, int> visitedIFD; /* "An Image File Directory (IFD) consists of a 2-byte count of the number of directory @@ -569,7 +569,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR } // remember that we've visited this directory and entry so that we don't visit it again later - DWORD visited = (DWORD)( (((size_t)ifdp & 0xFFFF) << 16) | (size_t)de ); + uint32_t visited = (uint32_t)( (((size_t)ifdp & 0xFFFF) << 16) | (size_t)de ); if(visitedIFD.find(visited) != visitedIFD.end()) { continue; } else { @@ -609,12 +609,12 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR FreeImage_SetTagType(tag, (FREE_IMAGE_MDTYPE)tag_type); // get number of components - DWORD tag_count = ReadUint32(msb_order, pde + 4); + uint32_t tag_count = ReadUint32(msb_order, pde + 4); FreeImage_SetTagCount(tag, tag_count); - // check that tag length (size of the tag value in bytes) will fit in a DWORD + // check that tag length (size of the tag value in bytes) will fit in a uint32_t unsigned tag_data_width = FreeImage_TagDataWidth(FreeImage_GetTagType(tag)); - if (tag_data_width != 0 && FreeImage_GetTagCount(tag) > ~(DWORD)0 / tag_data_width) { + if (tag_data_width != 0 && FreeImage_GetTagCount(tag) > ~(uint32_t)0 / tag_data_width) { FreeImage_DeleteTag(tag); // jump to next entry continue; @@ -626,7 +626,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR pval = pde + 8; } else { // if its bigger than 4 bytes, the directory entry contains an offset - DWORD offset_value = ReadUint32(msb_order, pde + 8); + uint32_t offset_value = ReadUint32(msb_order, pde + 8); // the offset can be relative to tiffp or to an external reference (see JPEG-XR) if(dwProfileOffset) { offset_value -= dwProfileOffset; @@ -659,7 +659,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR break; } if(isIFDOffset) { - DWORD sub_offset = 0; + uint32_t sub_offset = 0; TagLib::MDMODEL next_mdmodel = md_model; const uint8_t *next_ifd = ifdp; @@ -720,7 +720,7 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR const uint16_t entriesCount0th = ReadUint16(msb_order, ifd0th); - DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th)); + uint32_t next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th)); if((next_offset == 0) || (next_offset >= dwLength)) { return TRUE; //< no thumbnail } @@ -749,9 +749,9 @@ jpeg_read_exif_dir(FIBITMAP *dib, const uint8_t *tiffp, DWORD dwOffsetIfd0, DWOR // get the tag type /*uint16_t type = */ReadUint16(msb_order, base + sizeof(uint16_t)); // get number of components - /*DWORD count = */ReadUint32(msb_order, base + sizeof(uint16_t) + sizeof(uint16_t)); + /*uint32_t count = */ReadUint32(msb_order, base + sizeof(uint16_t) + sizeof(uint16_t)); // get the tag value - DWORD offset = ReadUint32(msb_order, base + sizeof(uint16_t) + sizeof(uint16_t) + sizeof(DWORD)); + uint32_t offset = ReadUint32(msb_order, base + sizeof(uint16_t) + sizeof(uint16_t) + sizeof(uint32_t)); switch(tag) { case TAG_COMPRESSION: @@ -818,7 +818,7 @@ jpeg_read_exif_profile(FIBITMAP *dib, const uint8_t *data, unsigned length) { uint8_t msb_first[4] = { 0x4D, 0x4D, 0x00, 0x2A }; // Classic TIFF signature - big-endian order // profile size is up to 32-bit - DWORD dwProfileLength = (DWORD)length; + uint32_t dwProfileLength = (uint32_t)length; uint8_t *pbProfile = (uint8_t*)data; // verify the identifying string @@ -850,7 +850,7 @@ jpeg_read_exif_profile(FIBITMAP *dib, const uint8_t *data, unsigned length) { } // this is the offset to the first IFD (Image File Directory) - DWORD dwFirstOffset = ReadUint32(bBigEndian, pbProfile + 4); + uint32_t dwFirstOffset = ReadUint32(bBigEndian, pbProfile + 4); if (dwFirstOffset > dwProfileLength) { // bad Exif data return FALSE; @@ -900,8 +900,8 @@ jpeg_read_exif_profile_raw(FIBITMAP *dib, const uint8_t *profile, unsigned lengt FITAG *tag = FreeImage_CreateTag(); if(tag) { FreeImage_SetTagKey(tag, g_TagLib_ExifRawFieldName); - FreeImage_SetTagLength(tag, (DWORD)length); - FreeImage_SetTagCount(tag, (DWORD)length); + FreeImage_SetTagLength(tag, (uint32_t)length); + FreeImage_SetTagCount(tag, (uint32_t)length); FreeImage_SetTagType(tag, FIDT_BYTE); FreeImage_SetTagValue(tag, profile); @@ -1056,7 +1056,7 @@ tiff_write_ifd(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, FIMEMORY *hmem) { std::vector<FITAG*> vTagList; TagLib::MDMODEL internal_md_model; - DWORD ifd_offset = 0; // uint16_t-aligned IFD value offset + uint32_t ifd_offset = 0; // uint16_t-aligned IFD value offset const uint8_t empty_byte = 0; @@ -1158,7 +1158,7 @@ tiff_write_ifd(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, FIMEMORY *hmem) { uint16_t tag_type = (uint16_t)FreeImage_GetTagType(tag); FreeImage_WriteMemory(&tag_type, 1, 2, hmem); // tag count - DWORD tag_count = FreeImage_GetTagCount(tag); + uint32_t tag_count = FreeImage_GetTagCount(tag); FreeImage_WriteMemory(&tag_count, 1, 4, hmem); // tag value or offset (results are in uint8_t's units) unsigned tag_length = FreeImage_GetTagLength(tag); @@ -1224,7 +1224,7 @@ tiff_get_ifd_profile(FIBITMAP *dib, FREE_IMAGE_MDMODEL md_model, uint8_t **ppbPr if(bResult) { uint8_t *data = NULL; - DWORD size_in_bytes = 0; + uint32_t size_in_bytes = 0; // get a pointer to the stream buffer FreeImage_AcquireMemory(hmem, &data, &size_in_bytes); @@ -1270,7 +1270,7 @@ psd_read_exif_profile(FIBITMAP *dib, const uint8_t *data, unsigned int length) { uint8_t msb_first[4] = { 0x4D, 0x4D, 0x00, 0x2A }; // Classic TIFF signature - big-endian order // profile size is up to 32-bit - DWORD dwProfileLength = (DWORD)length; + uint32_t dwProfileLength = (uint32_t)length; uint8_t *pbProfile = (uint8_t*)data; // This is an Exif profile @@ -1297,7 +1297,7 @@ psd_read_exif_profile(FIBITMAP *dib, const uint8_t *data, unsigned int length) { } // this is the offset to the first IFD (Image File Directory) - DWORD dwFirstOffset = ReadUint32(bBigEndian, pbProfile + 4); + uint32_t dwFirstOffset = ReadUint32(bBigEndian, pbProfile + 4); if (dwFirstOffset > dwProfileLength) { // bad Exif data return FALSE; @@ -1324,7 +1324,7 @@ psd_read_exif_profile_raw(FIBITMAP *dib, const uint8_t *profile, unsigned length return FALSE; } - DWORD dwProfileLength = (DWORD)length + sizeof(exif_signature); + uint32_t dwProfileLength = (uint32_t)length + sizeof(exif_signature); uint8_t *pbProfile = (uint8_t*)malloc(dwProfileLength); if(NULL == pbProfile) { // out of memory ... diff --git a/libs/freeimage/src/Metadata/FIRational.cpp b/libs/freeimage/src/Metadata/FIRational.cpp index 367b6c8f60..19e8a87f7c 100644 --- a/libs/freeimage/src/Metadata/FIRational.cpp +++ b/libs/freeimage/src/Metadata/FIRational.cpp @@ -52,7 +52,7 @@ FIRational::FIRational(const FITAG *tag) { switch(FreeImage_GetTagType((FITAG*)tag)) { case FIDT_RATIONAL: // 64-bit unsigned fraction { - DWORD *pvalue = (DWORD*)FreeImage_GetTagValue((FITAG*)tag); + uint32_t *pvalue = (uint32_t*)FreeImage_GetTagValue((FITAG*)tag); initialize((LONG)pvalue[0], (LONG)pvalue[1]); break; } diff --git a/libs/freeimage/src/Metadata/FreeImageTag.cpp b/libs/freeimage/src/Metadata/FreeImageTag.cpp index ceaec666f1..7ee55e50f2 100644 --- a/libs/freeimage/src/Metadata/FreeImageTag.cpp +++ b/libs/freeimage/src/Metadata/FreeImageTag.cpp @@ -36,8 +36,8 @@ FI_STRUCT (FITAGHEADER) { char *description; // tag description uint16_t id; // tag ID uint16_t type; // tag data type (see FREE_IMAGE_MDTYPE) - DWORD count; // number of components (in 'tag data types' units) - DWORD length; // value length in bytes + uint32_t count; // number of components (in 'tag data types' units) + uint32_t length; // value length in bytes void *value; // tag value }; @@ -168,12 +168,12 @@ FreeImage_GetTagType(FITAG *tag) { return tag ? (FREE_IMAGE_MDTYPE)(((FITAGHEADER *)tag->data)->type) : FIDT_NOTYPE; } -DWORD DLL_CALLCONV +uint32_t DLL_CALLCONV FreeImage_GetTagCount(FITAG *tag) { return tag ? ((FITAGHEADER *)tag->data)->count : 0; } -DWORD DLL_CALLCONV +uint32_t DLL_CALLCONV FreeImage_GetTagLength(FITAG *tag) { return tag ? ((FITAGHEADER *)tag->data)->length : 0; } @@ -228,7 +228,7 @@ FreeImage_SetTagType(FITAG *tag, FREE_IMAGE_MDTYPE type) { } BOOL DLL_CALLCONV -FreeImage_SetTagCount(FITAG *tag, DWORD count) { +FreeImage_SetTagCount(FITAG *tag, uint32_t count) { if(tag) { FITAGHEADER *tag_header = (FITAGHEADER *)tag->data; tag_header->count = count; @@ -238,7 +238,7 @@ FreeImage_SetTagCount(FITAG *tag, DWORD count) { } BOOL DLL_CALLCONV -FreeImage_SetTagLength(FITAG *tag, DWORD length) { +FreeImage_SetTagLength(FITAG *tag, uint32_t length) { if(tag) { FITAGHEADER *tag_header = (FITAGHEADER *)tag->data; tag_header->length = length; @@ -270,7 +270,7 @@ FreeImage_SetTagValue(FITAG *tag, const void *value) { } char *src_data = (char*)value; char *dst_data = (char*)tag_header->value; - for(DWORD i = 0; i < tag_header->length; i++) { + for(uint32_t i = 0; i < tag_header->length; i++) { dst_data[i] = src_data[i]; } dst_data[tag_header->length] = '\0'; diff --git a/libs/freeimage/src/Metadata/IPTC.cpp b/libs/freeimage/src/Metadata/IPTC.cpp index 149ecc9b33..92bc2e6a26 100644 --- a/libs/freeimage/src/Metadata/IPTC.cpp +++ b/libs/freeimage/src/Metadata/IPTC.cpp @@ -194,8 +194,8 @@ read_iptc_profile(FIBITMAP *dib, const uint8_t *dataptr, unsigned int datalen) { FreeImage_SetTagID(tag, TAG_KEYWORDS); FreeImage_SetTagKey(tag, tag_lib.getTagFieldName(TagLib::IPTC, TAG_KEYWORDS, defaultKey)); FreeImage_SetTagDescription(tag, tag_lib.getTagDescription(TagLib::IPTC, TAG_KEYWORDS)); - FreeImage_SetTagLength(tag, (DWORD)Keywords.length()); - FreeImage_SetTagCount(tag, (DWORD)Keywords.length()); + FreeImage_SetTagLength(tag, (uint32_t)Keywords.length()); + FreeImage_SetTagCount(tag, (uint32_t)Keywords.length()); FreeImage_SetTagValue(tag, (char*)Keywords.c_str()); FreeImage_SetMetadata(FIMD_IPTC, dib, FreeImage_GetTagKey(tag), tag); } @@ -206,8 +206,8 @@ read_iptc_profile(FIBITMAP *dib, const uint8_t *dataptr, unsigned int datalen) { FreeImage_SetTagID(tag, TAG_SUPPLEMENTAL_CATEGORIES); FreeImage_SetTagKey(tag, tag_lib.getTagFieldName(TagLib::IPTC, TAG_SUPPLEMENTAL_CATEGORIES, defaultKey)); FreeImage_SetTagDescription(tag, tag_lib.getTagDescription(TagLib::IPTC, TAG_SUPPLEMENTAL_CATEGORIES)); - FreeImage_SetTagLength(tag, (DWORD)SupplementalCategory.length()); - FreeImage_SetTagCount(tag, (DWORD)SupplementalCategory.length()); + FreeImage_SetTagLength(tag, (uint32_t)SupplementalCategory.length()); + FreeImage_SetTagCount(tag, (uint32_t)SupplementalCategory.length()); FreeImage_SetTagValue(tag, (char*)SupplementalCategory.c_str()); FreeImage_SetMetadata(FIMD_IPTC, dib, FreeImage_GetTagKey(tag), tag); } @@ -222,7 +222,7 @@ read_iptc_profile(FIBITMAP *dib, const uint8_t *dataptr, unsigned int datalen) { // -------------------------------------------------------------------------- static uint8_t* -append_iptc_tag(uint8_t *profile, unsigned *profile_size, uint16_t id, DWORD length, const void *value) { +append_iptc_tag(uint8_t *profile, unsigned *profile_size, uint16_t id, uint32_t length, const void *value) { uint8_t *buffer = NULL; // calculate the new buffer size @@ -303,7 +303,7 @@ write_iptc_profile(FIBITMAP *dib, uint8_t **profile, unsigned *profile_size) { // add as many tags as there are comma separated strings for(int i = 0; i < (int)output.size(); i++) { std::string& tag_value = output[i]; - buffer = append_iptc_tag(buffer, &buffer_size, tag_id, (DWORD)tag_value.length(), tag_value.c_str()); + buffer = append_iptc_tag(buffer, &buffer_size, tag_id, (uint32_t)tag_value.length(), tag_value.c_str()); } } @@ -311,14 +311,14 @@ write_iptc_profile(FIBITMAP *dib, uint8_t **profile, unsigned *profile_size) { case TAG_URGENCY: if(FreeImage_GetTagType(tag) == FIDT_ASCII) { - DWORD length = 1; // keep the first octet only + uint32_t length = 1; // keep the first octet only buffer = append_iptc_tag(buffer, &buffer_size, tag_id, length, FreeImage_GetTagValue(tag)); } break; default: if(FreeImage_GetTagType(tag) == FIDT_ASCII) { - DWORD length = FreeImage_GetTagLength(tag); + uint32_t length = FreeImage_GetTagLength(tag); buffer = append_iptc_tag(buffer, &buffer_size, tag_id, length, FreeImage_GetTagValue(tag)); } break; diff --git a/libs/freeimage/src/Metadata/TagConversion.cpp b/libs/freeimage/src/Metadata/TagConversion.cpp index 6d2ca14e2d..b87ae06dc9 100644 --- a/libs/freeimage/src/Metadata/TagConversion.cpp +++ b/libs/freeimage/src/Metadata/TagConversion.cpp @@ -37,7 +37,7 @@ static const char* ConvertAnyTag(FITAG *tag) { char format[MAX_TEXT_EXTENT]; static std::string buffer; - DWORD i; + uint32_t i; if(!tag) return NULL; @@ -47,7 +47,7 @@ ConvertAnyTag(FITAG *tag) { // convert the tag value to a string buffer FREE_IMAGE_MDTYPE tag_type = FreeImage_GetTagType(tag); - DWORD tag_count = FreeImage_GetTagCount(tag); + uint32_t tag_count = FreeImage_GetTagCount(tag); switch(tag_type) { case FIDT_BYTE: // N x 8-bit unsigned integer @@ -76,7 +76,7 @@ ConvertAnyTag(FITAG *tag) { } case FIDT_LONG: // N x 32-bit unsigned integer { - DWORD *pvalue = (DWORD *)FreeImage_GetTagValue(tag); + uint32_t *pvalue = (uint32_t *)FreeImage_GetTagValue(tag); sprintf(format, "%lu", pvalue[0]); buffer += format; @@ -88,7 +88,7 @@ ConvertAnyTag(FITAG *tag) { } case FIDT_RATIONAL: // N x 64-bit unsigned fraction { - DWORD *pvalue = (DWORD*)FreeImage_GetTagValue(tag); + uint32_t *pvalue = (uint32_t*)FreeImage_GetTagValue(tag); sprintf(format, "%ld/%ld", pvalue[0], pvalue[1]); buffer += format; @@ -172,7 +172,7 @@ ConvertAnyTag(FITAG *tag) { } case FIDT_IFD: // N x 32-bit unsigned integer (offset) { - DWORD *pvalue = (DWORD *)FreeImage_GetTagValue(tag); + uint32_t *pvalue = (uint32_t *)FreeImage_GetTagValue(tag); sprintf(format, "%X", pvalue[0]); buffer += format; @@ -295,7 +295,7 @@ ConvertExifTag(FITAG *tag) { case TAG_REFERENCE_BLACK_WHITE: { - DWORD *pvalue = (DWORD*)FreeImage_GetTagValue(tag); + uint32_t *pvalue = (uint32_t*)FreeImage_GetTagValue(tag); if(FreeImage_GetTagLength(tag) == 48) { // reference black point value and reference white point value (ReferenceBlackWhite) int blackR = 0, whiteR = 0, blackG = 0, whiteG = 0, blackB = 0, whiteB = 0; @@ -337,7 +337,7 @@ ConvertExifTag(FITAG *tag) { { const char *componentStrings[7] = {"", "Y", "Cb", "Cr", "R", "G", "B"}; uint8_t *pvalue = (uint8_t*)FreeImage_GetTagValue(tag); - for(DWORD i = 0; i < MIN((DWORD)4, FreeImage_GetTagCount(tag)); i++) { + for(uint32_t i = 0; i < MIN((uint32_t)4, FreeImage_GetTagCount(tag)); i++) { int j = pvalue[i]; if(j > 0 && j < 7) buffer += componentStrings[j]; @@ -886,7 +886,7 @@ ConvertExifTag(FITAG *tag) { // first 8 bytes are used to define an ID code // we assume this is an ASCII string const uint8_t *userComment = (uint8_t*)FreeImage_GetTagValue(tag); - for(DWORD i = 8; i < FreeImage_GetTagLength(tag); i++) { + for(uint32_t i = 8; i < FreeImage_GetTagLength(tag); i++) { buffer += userComment[i]; } buffer += '\0'; @@ -1005,7 +1005,7 @@ ConvertExifGPSTag(FITAG *tag) { case TAG_GPS_LONGITUDE: case TAG_GPS_TIME_STAMP: { - DWORD *pvalue = (DWORD*)FreeImage_GetTagValue(tag); + uint32_t *pvalue = (uint32_t*)FreeImage_GetTagValue(tag); if(FreeImage_GetTagLength(tag) == 24) { // dd:mm:ss or hh:mm:ss int dd = 0, mm = 0; diff --git a/libs/freeimage/src/Utilities.h b/libs/freeimage/src/Utilities.h index 5c8331eea3..a84733c23b 100644 --- a/libs/freeimage/src/Utilities.h +++ b/libs/freeimage/src/Utilities.h @@ -297,19 +297,19 @@ AssignPixel(uint8_t* dst, const uint8_t* src, unsigned bytesperpixel) { break; case 4: // FIT_BITMAP (32-bit) / FIT_UINT32 / FIT_INT32 / FIT_FLOAT - *(reinterpret_cast<DWORD*>(dst)) = *(reinterpret_cast<const DWORD*> (src)); + *(reinterpret_cast<uint32_t*>(dst)) = *(reinterpret_cast<const uint32_t*> (src)); break; case 6: // FIT_RGB16 (3 x 16-bit) - *(reinterpret_cast<DWORD*>(dst)) = *(reinterpret_cast<const DWORD*> (src)); + *(reinterpret_cast<uint32_t*>(dst)) = *(reinterpret_cast<const uint32_t*> (src)); *(reinterpret_cast<uint16_t*>(dst + 4)) = *(reinterpret_cast<const uint16_t*> (src + 4)); break; // the rest can be speeded up with int64 case 8: // FIT_RGBA16 (4 x 16-bit) - *(reinterpret_cast<DWORD*>(dst)) = *(reinterpret_cast<const DWORD*> (src)); - *(reinterpret_cast<DWORD*>(dst + 4)) = *(reinterpret_cast<const DWORD*> (src + 4)); + *(reinterpret_cast<uint32_t*>(dst)) = *(reinterpret_cast<const uint32_t*> (src)); + *(reinterpret_cast<uint32_t*>(dst + 4)) = *(reinterpret_cast<const uint32_t*> (src + 4)); break; case 12: // FIT_RGBF (3 x 32-bit IEEE floating point) @@ -389,20 +389,20 @@ __SwapUInt16(uint16_t arg) { #endif } -inline DWORD -__SwapUInt32(DWORD arg) { +inline uint32_t +__SwapUInt32(uint32_t arg) { #if defined(_MSC_VER) && _MSC_VER >= 1310 return _byteswap_ulong(arg); #elif defined(__i386__) && defined(__GNUC__) __asm__("bswap %0" : "+r" (arg)); return arg; #elif defined(__ppc__) && defined(__GNUC__) - DWORD result; + uint32_t result; __asm__("lwbrx %0,0,%1" : "=r" (result) : "r" (&arg), "m" (arg)); return result; #else // swap words then bytes - DWORD result; + uint32_t result; result = ((arg & 0x000000FF) << 24) | ((arg & 0x0000FF00) << 8) | ((arg >> 8) & 0x0000FF00) | ((arg >> 24) & 0x000000FF); return result; #endif @@ -414,7 +414,7 @@ SwapShort(uint16_t *sp) { } inline void -SwapLong(DWORD *lp) { +SwapLong(uint32_t *lp) { *lp = __SwapUInt32(*lp); } @@ -425,7 +425,7 @@ SwapInt64(UINT64 *arg) { #else union Swap { UINT64 sv; - DWORD ul[2]; + uint32_t ul[2]; } tmp, result; tmp.sv = *arg; SwapLong(&tmp.ul[0]); diff --git a/libs/freeimage/src/main.cpp b/libs/freeimage/src/main.cpp index 6ad4629fef..32ee35042b 100644 --- a/libs/freeimage/src/main.cpp +++ b/libs/freeimage/src/main.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. EXTERN_C DLL_API void DLL_CALLCONV FreeImage_CorrectBitmap32Alpha(HBITMAP hBitmap, BOOL force) { BITMAP bmp; - DWORD dwLen; + uint32_t dwLen; uint8_t *p; int x, y; BOOL fixIt; diff --git a/libs/mTextControl/src/FormattedTextDraw.cpp b/libs/mTextControl/src/FormattedTextDraw.cpp index 04fa7f6042..58023f93fb 100644 --- a/libs/mTextControl/src/FormattedTextDraw.cpp +++ b/libs/mTextControl/src/FormattedTextDraw.cpp @@ -31,7 +31,7 @@ const IID IID_ITextDocument = { ///////////////////////////////////////////////////////////////////////////// // CallBack functions -DWORD CALLBACK EditStreamInCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb) +uint32_t CALLBACK EditStreamInCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb) { COOKIE *pCookie = (COOKIE*)dwCookie; if (pCookie->isUnicode) { @@ -43,7 +43,7 @@ DWORD CALLBACK EditStreamInCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, pCookie->cbCount += *pcb / sizeof(wchar_t); } else { - if (pCookie->cbSize - pCookie->cbCount < (DWORD)cb) + if (pCookie->cbSize - pCookie->cbCount < (uint32_t)cb) *pcb = LONG(pCookie->cbSize - pCookie->cbCount); else *pcb = cb; diff --git a/libs/mTextControl/src/FormattedTextDraw.h b/libs/mTextControl/src/FormattedTextDraw.h index 27ac6c8810..49468753b6 100644 --- a/libs/mTextControl/src/FormattedTextDraw.h +++ b/libs/mTextControl/src/FormattedTextDraw.h @@ -143,7 +143,7 @@ public: HRESULT TxDeactivate(LONG lNewState); HRESULT TxGetClientRect(LPRECT prc); HRESULT TxGetViewInset(LPRECT prc); - HRESULT TxGetCharFormat(const CHARFORMATW **ppCF); + HRESULT TxGetCharFormat(const CHARFORMATW **ppCF); HRESULT TxGetParaFormat(const PARAFORMAT **ppPF); COLORREF TxGetSysColor(int nIndex); HRESULT TxGetBackStyle(TXTBACKSTYLE *pstyle); @@ -152,7 +152,7 @@ public: HRESULT TxGetPasswordChar(wchar_t *pch); HRESULT TxGetAcceleratorPos(LONG *pcp); HRESULT TxGetExtent(LPSIZEL lpExtent); - HRESULT OnTxCharFormatChange(const CHARFORMATW * pcf); + HRESULT OnTxCharFormatChange(const CHARFORMATW * pcf); HRESULT OnTxParaFormatChange(const PARAFORMAT * ppf); HRESULT TxGetPropertyBits(DWORD dwMask, DWORD *pdwBits); HRESULT TxNotify(DWORD iNotify, void *pv); @@ -177,9 +177,9 @@ public: CHARFORMAT2W *m_pCF; PARAFORMAT2 m_PF; - DWORD m_dwScrollbar; // Scroll bar style - DWORD m_dwPropertyBits; // Property bits - DWORD m_dwMaxLength; + uint32_t m_dwScrollbar; // Scroll bar style + uint32_t m_dwPropertyBits; // Property bits + uint32_t m_dwMaxLength; COOKIE m_editCookie; ITextServices *m_spTextServices; diff --git a/libs/mTextControl/src/dataobject.cpp b/libs/mTextControl/src/dataobject.cpp index 1d14d28afb..cc05369021 100644 --- a/libs/mTextControl/src/dataobject.cpp +++ b/libs/mTextControl/src/dataobject.cpp @@ -34,9 +34,9 @@ public: HRESULT __stdcall QueryGetData(FORMATETC *pFormatEtc); HRESULT __stdcall GetCanonicalFormatEtc(FORMATETC *pFormatEct, FORMATETC *pFormatEtcOut); HRESULT __stdcall SetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium, BOOL fRelease); - HRESULT __stdcall EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc); + HRESULT __stdcall EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc); HRESULT __stdcall DAdvise(FORMATETC *pFormatEtc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection); - HRESULT __stdcall DUnadvise(DWORD dwConnection); + HRESULT __stdcall DUnadvise(DWORD dwConnection); HRESULT __stdcall EnumDAdvise(IEnumSTATDATA **ppEnumAdvise); // diff --git a/libs/mTextControl/src/fancy_rtf.cpp b/libs/mTextControl/src/fancy_rtf.cpp index ef1b4164f7..29c62c0ba5 100644 --- a/libs/mTextControl/src/fancy_rtf.cpp +++ b/libs/mTextControl/src/fancy_rtf.cpp @@ -6,8 +6,8 @@ struct BBCodeInfo { wchar_t *start; wchar_t *end; - bool(*func)(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *txt, DWORD cookie); - DWORD cookie; + bool(*func)(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *txt, uint32_t cookie); + uint32_t cookie; }; enum { @@ -16,7 +16,7 @@ enum { BBS_IMG1, BBS_IMG2 }; -static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *pwszText, DWORD cookie) +static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *pwszText, uint32_t cookie) { wchar_t *pwszStr = L""; CHARFORMAT cf = { 0 }; @@ -75,7 +75,7 @@ static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t * return true; } -static bool bbCodeImageFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *txt, DWORD) +static bool bbCodeImageFunc(IFormattedTextDraw *ftd, CHARRANGE range, wchar_t *txt, uint32_t) { ITextServices *ts = ftd->getTextService(); ITextDocument *td = ftd->getTextDocument(); diff --git a/libs/mTextControl/src/services.cpp b/libs/mTextControl/src/services.cpp index b27b667180..ae6524b758 100644 --- a/libs/mTextControl/src/services.cpp +++ b/libs/mTextControl/src/services.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA struct TextObject { - DWORD options; + uint32_t options; const char *szProto; IFormattedTextDraw *ftd; TextObject() : options(0), ftd(nullptr) {} @@ -32,7 +32,7 @@ struct TextObject ///////////////////////////////////////////////////////////////////////////////////////// // elper functions -void MText_InitFormatting0(IFormattedTextDraw *ftd, DWORD) +void MText_InitFormatting0(IFormattedTextDraw *ftd, uint32_t) { LRESULT lResult; @@ -81,7 +81,7 @@ MTEXTCONTROL_DLL(HANDLE) MTextCreateW(HANDLE userHandle, const char *szProto, co ///////////////////////////////////////////////////////////////////////////////////////// // allocate text object (advanced) -MTEXTCONTROL_DLL(HANDLE) MTextCreateEx(HANDLE userHandle, void *text, DWORD flags) +MTEXTCONTROL_DLL(HANDLE) MTextCreateEx(HANDLE userHandle, void *text, uint32_t flags) { TextObject *result = new TextObject; result->options = TextUserGetOptions(userHandle); diff --git a/libs/mTextControl/src/textusers.cpp b/libs/mTextControl/src/textusers.cpp index 6463d96b9d..2ea5569b8a 100644 --- a/libs/mTextControl/src/textusers.cpp +++ b/libs/mTextControl/src/textusers.cpp @@ -49,7 +49,7 @@ DWORD TextUserGetOptions(HANDLE userHandle) return ((TextUser *)userHandle)->options; } -void TextUserSetOptions(HANDLE userHandle, DWORD options) +void TextUserSetOptions(HANDLE userHandle, uint32_t options) { if (!userHandle) return; ((TextUser *)userHandle)->options = options; diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib Binary files differindex 2c8e2c3762..309e95d48d 100644 --- a/libs/win32/mir_app.lib +++ b/libs/win32/mir_app.lib diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib Binary files differindex 31ba3b610a..78d5779a36 100644 --- a/libs/win32/mir_core.lib +++ b/libs/win32/mir_core.lib diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib Binary files differindex be614d3a51..044e331694 100644 --- a/libs/win64/mir_app.lib +++ b/libs/win64/mir_app.lib diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib Binary files differindex 1f792ea41f..de435d8700 100644 --- a/libs/win64/mir_core.lib +++ b/libs/win64/mir_core.lib |