Skip to content

Commit 47ecf8e

Browse files
author
Grok Compression
committed
a few small changes to allow cross compile on mingw
1 parent c83aad2 commit 47ecf8e

12 files changed

Lines changed: 12 additions & 10 deletions

File tree

examples/codec/codec_compress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <string>
1919
#include <cstring>
2020
#include <filesystem>
21-
#include <inttypes.h>
21+
#include <cinttypes>
2222

2323
#include "grok_codec.h"
2424
#include "grk_examples_config.h"

examples/core/core_compress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ of three approaches for the destination:
3030
#include <cstring>
3131
#include <memory>
3232
#include <cstdlib>
33-
#include <inttypes.h>
33+
#include <cinttypes>
3434

3535
#include "grok.h"
3636
#include "core.h"

examples/core/core_decompress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Complex example demonstrating a variety of options for decompression
2828
#include <iostream>
2929
#include <cstdlib>
3030
#include <regex>
31-
#include <inttypes.h>
31+
#include <cinttypes>
3232

3333
#include "grok.h"
3434
#include "grk_examples_config.h"

examples/core/core_decompress_async.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This pattern is used by the GDAL JP2Grok driver:
3737
#include <algorithm>
3838
#include <chrono>
3939
#include <sstream>
40-
#include <inttypes.h>
40+
#include <cinttypes>
4141

4242
#include "grok.h"
4343
#include "grk_examples_config.h"

examples/core/core_simple.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ with memory buffers as source and destination
2525
#include <cstdio>
2626
#include <cstring>
2727
#include <memory>
28-
#include <inttypes.h>
28+
#include <cinttypes>
2929
#include <vector>
3030
#include <chrono>
3131
#include <cstdlib>

src/lib/codec/apps/GrkCompress.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <cstddef>
2323
#include <cstdlib>
2424
#include <sstream>
25+
#include <cinttypes>
2526
#ifndef _WIN32
2627
#include <cstring>
2728
#include <sys/time.h>

src/lib/codec/apps/GrkDecompress.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717

1818
#include <filesystem>
19+
#include <cinttypes>
1920
#ifndef _WIN32
2021
#include <sys/time.h>
2122
#include <sys/resource.h>

src/lib/codec/common/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "grk_config_private.h"
2121
#ifdef _WIN32
22-
#include <Windows.h>
22+
#include <windows.h>
2323
#include <io.h>
2424
#include <fcntl.h>
2525
#else

src/lib/codec/formats/fileio/IFileIO.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static inline void* grkAlignedAllocN(size_t alignment, size_t size)
5454
#ifdef _WIN32
5555
return _aligned_malloc(size, alignment);
5656
#else
57-
return std::aligned_alloc(alignment, size);
57+
return ::aligned_alloc(alignment, size);
5858
#endif
5959
}
6060
static void* grk_aligned_malloc(size_t size)

src/lib/core/plugin/gpup/gpu_plugin_shared.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ inline gpup_image* gpup_image_new(uint16_t numcmpts, gpup_image_comp* cmptparms,
492492
size_t dataSize = (size_t)stride * cmptparms[i].h * sizeof(int32_t);
493493
dataSize = ((dataSize + GPUP_BUFFER_ALIGNMENT - 1) / GPUP_BUFFER_ALIGNMENT) *
494494
GPUP_BUFFER_ALIGNMENT;
495-
img->comps[i].data = (int32_t*)std::aligned_alloc(GPUP_BUFFER_ALIGNMENT, dataSize);
495+
img->comps[i].data = (int32_t*)::aligned_alloc(GPUP_BUFFER_ALIGNMENT, dataSize);
496496
if(img->comps[i].data)
497497
memset(img->comps[i].data, 0, dataSize);
498498
img->comps[i].stride = stride;

0 commit comments

Comments
 (0)