tiny_gltf 0.1.1 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. checksums.yaml +4 -4
  2. data/.gitmodules +3 -0
  3. data/Gemfile.lock +3 -3
  4. data/bin/setup +2 -0
  5. data/ext/tiny_gltf/rb_tiny_gltf.h +18 -7
  6. data/ext/tiny_gltf/rb_tiny_gltf_accessor.cpp +4 -12
  7. data/ext/tiny_gltf/rb_tiny_gltf_animation.cpp +6 -5
  8. data/ext/tiny_gltf/rb_tiny_gltf_animation_channel.cpp +6 -5
  9. data/ext/tiny_gltf/rb_tiny_gltf_animation_sampler.cpp +6 -5
  10. data/ext/tiny_gltf/rb_tiny_gltf_asset.cpp +4 -3
  11. data/ext/tiny_gltf/rb_tiny_gltf_buffer.cpp +37 -8
  12. data/ext/tiny_gltf/rb_tiny_gltf_buffer_view.cpp +4 -3
  13. data/ext/tiny_gltf/rb_tiny_gltf_camera.cpp +4 -3
  14. data/ext/tiny_gltf/rb_tiny_gltf_extension_map.cpp +2 -2
  15. data/ext/tiny_gltf/rb_tiny_gltf_image.cpp +72 -12
  16. data/ext/tiny_gltf/rb_tiny_gltf_init.c +66 -1
  17. data/ext/tiny_gltf/rb_tiny_gltf_light.cpp +2 -1
  18. data/ext/tiny_gltf/rb_tiny_gltf_material.cpp +6 -5
  19. data/ext/tiny_gltf/rb_tiny_gltf_mesh.cpp +5 -17
  20. data/ext/tiny_gltf/rb_tiny_gltf_model.cpp +10 -10
  21. data/ext/tiny_gltf/rb_tiny_gltf_node.cpp +8 -7
  22. data/ext/tiny_gltf/rb_tiny_gltf_parameter_map.cpp +2 -2
  23. data/ext/tiny_gltf/rb_tiny_gltf_primitive.cpp +8 -7
  24. data/ext/tiny_gltf/rb_tiny_gltf_sampler.cpp +3 -2
  25. data/ext/tiny_gltf/rb_tiny_gltf_scene.cpp +7 -6
  26. data/ext/tiny_gltf/rb_tiny_gltf_skin.cpp +6 -5
  27. data/ext/tiny_gltf/rb_tiny_gltf_texture.cpp +7 -6
  28. data/ext/tiny_gltf/rb_tiny_gltf_types.cpp +7 -7
  29. data/ext/tiny_gltf/rb_tiny_gltf_value.cpp +5 -4
  30. data/ext/tiny_gltf/stb_image.h +1890 -869
  31. data/ext/tiny_gltf/stb_image_write.h +1241 -1451
  32. data/ext/tiny_gltf/tiny_gltf.h +3671 -1082
  33. data/lib/tiny_gltf.rb +385 -126
  34. data/lib/tiny_gltf/version.rb +1 -1
  35. metadata +4 -4
@@ -1,6 +1,6 @@
1
- /* stb_image_write - v1.09 - public domain -
2
- http://nothings.org/stb/stb_image_write.h writes out PNG/BMP/TGA/JPEG/HDR images
3
- to C stdio - Sean Barrett 2010-2015 no warranty implied; use at your own risk
1
+ /* stb_image_write - v1.11 - public domain - http://nothings.org/stb/stb_image_write.h
2
+ writes out PNG/BMP/TGA/JPEG/HDR images to C stdio - Sean Barrett 2010-2015
3
+ no warranty implied; use at your own risk
4
4
 
5
5
  Before #including,
6
6
 
@@ -10,16 +10,14 @@ to C stdio - Sean Barrett 2010-2015 no warranty implied; use at your own risk
10
10
 
11
11
  Will probably not work correctly with strict-aliasing optimizations.
12
12
 
13
- If using a modern Microsoft Compiler, non-safe versions of CRT calls may
14
- cause compilation warnings or even errors. To avoid this, also before
15
- #including,
13
+ If using a modern Microsoft Compiler, non-safe versions of CRT calls may cause
14
+ compilation warnings or even errors. To avoid this, also before #including,
16
15
 
17
16
  #define STBI_MSC_SECURE_CRT
18
17
 
19
18
  ABOUT:
20
19
 
21
- This header file is a library for writing images to C stdio. It could be
22
- adapted to write to memory or a general streaming interface; let me know.
20
+ This header file is a library for writing images to C stdio or a callback.
23
21
 
24
22
  The PNG output is not optimal; it is 20-50% larger than the file
25
23
  written by a decent optimizing implementation; though providing a custom
@@ -33,48 +31,48 @@ BUILDING:
33
31
  You can #define STBIW_MALLOC(), STBIW_REALLOC(), and STBIW_FREE() to replace
34
32
  malloc,realloc,free.
35
33
  You can #define STBIW_MEMMOVE() to replace memmove()
36
- You can #define STBIW_ZLIB_COMPRESS to use a custom zlib-style compress
37
- function for PNG compression (instead of the builtin one), it must have the
38
- following signature: unsigned char * my_compress(unsigned char *data, int
39
- data_len, int *out_len, int quality); The returned data will be freed with
40
- STBIW_FREE() (free() by default), so it must be heap allocated with
41
- STBIW_MALLOC() (malloc() by default),
34
+ You can #define STBIW_ZLIB_COMPRESS to use a custom zlib-style compress function
35
+ for PNG compression (instead of the builtin one), it must have the following signature:
36
+ unsigned char * my_compress(unsigned char *data, int data_len, int *out_len, int quality);
37
+ The returned data will be freed with STBIW_FREE() (free() by default),
38
+ so it must be heap allocated with STBIW_MALLOC() (malloc() by default),
39
+
40
+ UNICODE:
41
+
42
+ If compiling for Windows and you wish to use Unicode filenames, compile
43
+ with
44
+ #define STBIW_WINDOWS_UTF8
45
+ and pass utf8-encoded filenames. Call stbiw_convert_wchar_to_utf8 to convert
46
+ Windows wchar_t filenames to utf8.
42
47
 
43
48
  USAGE:
44
49
 
45
50
  There are five functions, one for each image file format:
46
51
 
47
- int stbi_write_png(char const *filename, int w, int h, int comp, const void
48
- *data, int stride_in_bytes); int stbi_write_bmp(char const *filename, int w, int
49
- h, int comp, const void *data); int stbi_write_tga(char const *filename, int w,
50
- int h, int comp, const void *data); int stbi_write_jpg(char const *filename, int
51
- w, int h, int comp, const void *data, int quality); int stbi_write_hdr(char
52
- const *filename, int w, int h, int comp, const float *data);
53
-
54
- void stbi_flip_vertically_on_write(int flag); // flag is non-zero to flip
55
- data vertically
56
-
57
- There are also five equivalent functions that use an arbitrary write
58
- function. You are expected to open/close your file-equivalent before and after
59
- calling these:
60
-
61
- int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int
62
- h, int comp, const void *data, int stride_in_bytes); int
63
- stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int
64
- comp, const void *data); int stbi_write_tga_to_func(stbi_write_func *func, void
65
- *context, int w, int h, int comp, const void *data); int
66
- stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int
67
- comp, const float *data); int stbi_write_jpg_to_func(stbi_write_func *func, void
68
- *context, int x, int y, int comp, const void *data, int quality);
52
+ int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes);
53
+ int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data);
54
+ int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data);
55
+ int stbi_write_jpg(char const *filename, int w, int h, int comp, const void *data, int quality);
56
+ int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data);
57
+
58
+ void stbi_flip_vertically_on_write(int flag); // flag is non-zero to flip data vertically
59
+
60
+ There are also five equivalent functions that use an arbitrary write function. You are
61
+ expected to open/close your file-equivalent before and after calling these:
62
+
63
+ int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes);
64
+ int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data);
65
+ int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data);
66
+ int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data);
67
+ int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality);
69
68
 
70
69
  where the callback is:
71
70
  void stbi_write_func(void *context, void *data, int size);
72
71
 
73
72
  You can configure it with these global variables:
74
- int stbi_write_tga_with_rle; // defaults to true; set to 0 to
75
- disable RLE int stbi_write_png_compression_level; // defaults to 8; set to
76
- higher for more compression int stbi_write_force_png_filter; // defaults
77
- to -1; set to 0..5 to force a filter mode
73
+ int stbi_write_tga_with_rle; // defaults to true; set to 0 to disable RLE
74
+ int stbi_write_png_compression_level; // defaults to 8; set to higher for more compression
75
+ int stbi_write_force_png_filter; // defaults to -1; set to 0..5 to force a filter mode
78
76
 
79
77
 
80
78
  You can define STBI_WRITE_NO_STDIO to disable the file variant of these
@@ -113,7 +111,6 @@ to -1; set to 0..5 to force a filter mode
113
111
  TGA supports RLE or non-RLE compressed data. To use non-RLE-compressed
114
112
  data, set the global variable 'stbi_write_tga_with_rle' to 0.
115
113
 
116
-
117
114
  JPEG does ignore alpha channels in input data; quality is between 1 and 100.
118
115
  Higher quality looks better but results in a bigger image.
119
116
  JPEG baseline (no JPEG progressive).
@@ -121,7 +118,7 @@ to -1; set to 0..5 to force a filter mode
121
118
  CREDITS:
122
119
 
123
120
 
124
- Sean Barrett - PNG/BMP/TGA
121
+ Sean Barrett - PNG/BMP/TGA
125
122
  Baldur Karlsson - HDR
126
123
  Jean-Sebastien Guay - TGA monochrome
127
124
  Tim Kelsey - misc enhancements
@@ -158,16 +155,17 @@ LICENSE
158
155
  #ifndef INCLUDE_STB_IMAGE_WRITE_H
159
156
  #define INCLUDE_STB_IMAGE_WRITE_H
160
157
 
161
- // if STB_IMAGE_WRITE_STATIC causes problems, try defining STBIWDEF to 'inline'
162
- // or 'static inline'
158
+ #include <stdlib.h>
159
+
160
+ // if STB_IMAGE_WRITE_STATIC causes problems, try defining STBIWDEF to 'inline' or 'static inline'
163
161
  #ifndef STBIWDEF
164
162
  #ifdef STB_IMAGE_WRITE_STATIC
165
- #define STBIWDEF static
163
+ #define STBIWDEF static
166
164
  #else
167
165
  #ifdef __cplusplus
168
- #define STBIWDEF extern "C"
166
+ #define STBIWDEF extern "C"
169
167
  #else
170
- #define STBIWDEF extern
168
+ #define STBIWDEF extern
171
169
  #endif
172
170
  #endif
173
171
  #endif
@@ -179,400 +177,422 @@ extern int stbi_write_force_png_filter;
179
177
  #endif
180
178
 
181
179
  #ifndef STBI_WRITE_NO_STDIO
182
- STBIWDEF int stbi_write_png(char const *filename, int w, int h, int comp,
183
- const void *data, int stride_in_bytes);
184
- STBIWDEF int stbi_write_bmp(char const *filename, int w, int h, int comp,
185
- const void *data);
186
- STBIWDEF int stbi_write_tga(char const *filename, int w, int h, int comp,
187
- const void *data);
188
- STBIWDEF int stbi_write_hdr(char const *filename, int w, int h, int comp,
189
- const float *data);
190
- STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp,
191
- const void *data, int quality);
180
+ STBIWDEF int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes);
181
+ STBIWDEF int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data);
182
+ STBIWDEF int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data);
183
+ STBIWDEF int stbi_write_hdr(char const *filename, int w, int h, int comp, const float *data);
184
+ STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality);
185
+
186
+ #ifdef STBI_WINDOWS_UTF8
187
+ STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input);
188
+ #endif
192
189
  #endif
193
190
 
194
191
  typedef void stbi_write_func(void *context, void *data, int size);
195
192
 
196
- STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int w,
197
- int h, int comp, const void *data,
198
- int stride_in_bytes);
199
- STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w,
200
- int h, int comp, const void *data);
201
- STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w,
202
- int h, int comp, const void *data);
203
- STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w,
204
- int h, int comp, const float *data);
205
- STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x,
206
- int y, int comp, const void *data,
207
- int quality);
193
+ STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data, int stride_in_bytes);
194
+ STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data);
195
+ STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const void *data);
196
+ STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int comp, const float *data);
197
+ STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality);
208
198
 
209
199
  STBIWDEF void stbi_flip_vertically_on_write(int flip_boolean);
210
200
 
211
- #endif // INCLUDE_STB_IMAGE_WRITE_H
201
+ #endif//INCLUDE_STB_IMAGE_WRITE_H
212
202
 
213
203
  #ifdef STB_IMAGE_WRITE_IMPLEMENTATION
214
204
 
215
205
  #ifdef _WIN32
216
- #ifndef _CRT_SECURE_NO_WARNINGS
217
- #define _CRT_SECURE_NO_WARNINGS
218
- #endif
219
- #ifndef _CRT_NONSTDC_NO_DEPRECATE
220
- #define _CRT_NONSTDC_NO_DEPRECATE
221
- #endif
206
+ #ifndef _CRT_SECURE_NO_WARNINGS
207
+ #define _CRT_SECURE_NO_WARNINGS
208
+ #endif
209
+ #ifndef _CRT_NONSTDC_NO_DEPRECATE
210
+ #define _CRT_NONSTDC_NO_DEPRECATE
211
+ #endif
222
212
  #endif
223
213
 
224
214
  #ifndef STBI_WRITE_NO_STDIO
225
215
  #include <stdio.h>
226
- #endif // STBI_WRITE_NO_STDIO
216
+ #endif // STBI_WRITE_NO_STDIO
227
217
 
228
- #include <math.h>
229
218
  #include <stdarg.h>
230
219
  #include <stdlib.h>
231
220
  #include <string.h>
221
+ #include <math.h>
232
222
 
233
- #if defined(STBIW_MALLOC) && defined(STBIW_FREE) && \
234
- (defined(STBIW_REALLOC) || defined(STBIW_REALLOC_SIZED))
223
+ #if defined(STBIW_MALLOC) && defined(STBIW_FREE) && (defined(STBIW_REALLOC) || defined(STBIW_REALLOC_SIZED))
235
224
  // ok
236
- #elif !defined(STBIW_MALLOC) && !defined(STBIW_FREE) && \
237
- !defined(STBIW_REALLOC) && !defined(STBIW_REALLOC_SIZED)
225
+ #elif !defined(STBIW_MALLOC) && !defined(STBIW_FREE) && !defined(STBIW_REALLOC) && !defined(STBIW_REALLOC_SIZED)
238
226
  // ok
239
227
  #else
240
- #error \
241
- "Must define all or none of STBIW_MALLOC, STBIW_FREE, and STBIW_REALLOC (or STBIW_REALLOC_SIZED)."
228
+ #error "Must define all or none of STBIW_MALLOC, STBIW_FREE, and STBIW_REALLOC (or STBIW_REALLOC_SIZED)."
242
229
  #endif
243
230
 
244
231
  #ifndef STBIW_MALLOC
245
- #define STBIW_MALLOC(sz) malloc(sz)
246
- #define STBIW_REALLOC(p, newsz) realloc(p, newsz)
247
- #define STBIW_FREE(p) free(p)
232
+ #define STBIW_MALLOC(sz) malloc(sz)
233
+ #define STBIW_REALLOC(p,newsz) realloc(p,newsz)
234
+ #define STBIW_FREE(p) free(p)
248
235
  #endif
249
236
 
250
237
  #ifndef STBIW_REALLOC_SIZED
251
- #define STBIW_REALLOC_SIZED(p, oldsz, newsz) STBIW_REALLOC(p, newsz)
238
+ #define STBIW_REALLOC_SIZED(p,oldsz,newsz) STBIW_REALLOC(p,newsz)
252
239
  #endif
253
240
 
241
+
254
242
  #ifndef STBIW_MEMMOVE
255
- #define STBIW_MEMMOVE(a, b, sz) memmove(a, b, sz)
243
+ #define STBIW_MEMMOVE(a,b,sz) memmove(a,b,sz)
256
244
  #endif
257
245
 
246
+
258
247
  #ifndef STBIW_ASSERT
259
248
  #include <assert.h>
260
249
  #define STBIW_ASSERT(x) assert(x)
261
250
  #endif
262
251
 
263
- #define STBIW_UCHAR(x) (unsigned char)((x)&0xff)
252
+ #define STBIW_UCHAR(x) (unsigned char) ((x) & 0xff)
264
253
 
265
254
  #ifdef STB_IMAGE_WRITE_STATIC
266
- static int stbi__flip_vertically_on_write = 0;
255
+ static int stbi__flip_vertically_on_write=0;
267
256
  static int stbi_write_png_compression_level = 8;
268
257
  static int stbi_write_tga_with_rle = 1;
269
258
  static int stbi_write_force_png_filter = -1;
270
259
  #else
271
260
  int stbi_write_png_compression_level = 8;
272
- int stbi__flip_vertically_on_write = 0;
261
+ int stbi__flip_vertically_on_write=0;
273
262
  int stbi_write_tga_with_rle = 1;
274
263
  int stbi_write_force_png_filter = -1;
275
264
  #endif
276
265
 
277
- STBIWDEF void stbi_flip_vertically_on_write(int flag) {
278
- stbi__flip_vertically_on_write = flag;
266
+ STBIWDEF void stbi_flip_vertically_on_write(int flag)
267
+ {
268
+ stbi__flip_vertically_on_write = flag;
279
269
  }
280
270
 
281
- typedef struct {
282
- stbi_write_func *func;
283
- void *context;
271
+ typedef struct
272
+ {
273
+ stbi_write_func *func;
274
+ void *context;
284
275
  } stbi__write_context;
285
276
 
286
277
  // initialize a callback-based context
287
- static void stbi__start_write_callbacks(stbi__write_context *s,
288
- stbi_write_func *c, void *context) {
289
- s->func = c;
290
- s->context = context;
278
+ static void stbi__start_write_callbacks(stbi__write_context *s, stbi_write_func *c, void *context)
279
+ {
280
+ s->func = c;
281
+ s->context = context;
291
282
  }
292
283
 
293
284
  #ifndef STBI_WRITE_NO_STDIO
294
285
 
295
- static void stbi__stdio_write(void *context, void *data, int size) {
296
- fwrite(data, 1, size, (FILE *)context);
286
+ static void stbi__stdio_write(void *context, void *data, int size)
287
+ {
288
+ fwrite(data,1,size,(FILE*) context);
297
289
  }
298
290
 
299
- static int stbi__start_write_file(stbi__write_context *s,
300
- const char *filename) {
301
- FILE *f;
302
- #ifdef STBI_MSC_SECURE_CRT
303
- if (fopen_s(&f, filename, "wb")) f = NULL;
291
+ #if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8)
292
+ #ifdef __cplusplus
293
+ #define STBIW_EXTERN extern "C"
294
+ #else
295
+ #define STBIW_EXTERN extern
296
+ #endif
297
+ STBIW_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide);
298
+ STBIW_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default);
299
+
300
+ STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input)
301
+ {
302
+ return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, bufferlen, NULL, NULL);
303
+ }
304
+ #endif
305
+
306
+ static FILE *stbiw__fopen(char const *filename, char const *mode)
307
+ {
308
+ FILE *f;
309
+ #if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8)
310
+ wchar_t wMode[64];
311
+ wchar_t wFilename[1024];
312
+ if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)))
313
+ return 0;
314
+
315
+ if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)))
316
+ return 0;
317
+
318
+ #if _MSC_VER >= 1400
319
+ if (0 != _wfopen_s(&f, wFilename, wMode))
320
+ f = 0;
321
+ #else
322
+ f = _wfopen(wFilename, wMode);
323
+ #endif
324
+
325
+ #elif defined(_MSC_VER) && _MSC_VER >= 1400
326
+ if (0 != fopen_s(&f, filename, mode))
327
+ f=0;
304
328
  #else
305
- f = fopen(filename, "wb");
329
+ f = fopen(filename, mode);
306
330
  #endif
307
- stbi__start_write_callbacks(s, stbi__stdio_write, (void *)f);
308
- return f != NULL;
331
+ return f;
309
332
  }
310
333
 
311
- static void stbi__end_write_file(stbi__write_context *s) {
312
- fclose((FILE *)s->context);
334
+ static int stbi__start_write_file(stbi__write_context *s, const char *filename)
335
+ {
336
+ FILE *f = stbiw__fopen(filename, "wb");
337
+ stbi__start_write_callbacks(s, stbi__stdio_write, (void *) f);
338
+ return f != NULL;
313
339
  }
314
340
 
315
- #endif // !STBI_WRITE_NO_STDIO
341
+ static void stbi__end_write_file(stbi__write_context *s)
342
+ {
343
+ fclose((FILE *)s->context);
344
+ }
345
+
346
+ #endif // !STBI_WRITE_NO_STDIO
316
347
 
317
348
  typedef unsigned int stbiw_uint32;
318
- typedef int stb_image_write_test[sizeof(stbiw_uint32) == 4 ? 1 : -1];
319
-
320
- static void stbiw__writefv(stbi__write_context *s, const char *fmt, va_list v) {
321
- while (*fmt) {
322
- switch (*fmt++) {
323
- case ' ':
324
- break;
325
- case '1': {
326
- unsigned char x = STBIW_UCHAR(va_arg(v, int));
327
- s->func(s->context, &x, 1);
328
- break;
329
- }
330
- case '2': {
331
- int x = va_arg(v, int);
332
- unsigned char b[2];
333
- b[0] = STBIW_UCHAR(x);
334
- b[1] = STBIW_UCHAR(x >> 8);
335
- s->func(s->context, b, 2);
336
- break;
337
- }
338
- case '4': {
339
- stbiw_uint32 x = va_arg(v, int);
340
- unsigned char b[4];
341
- b[0] = STBIW_UCHAR(x);
342
- b[1] = STBIW_UCHAR(x >> 8);
343
- b[2] = STBIW_UCHAR(x >> 16);
344
- b[3] = STBIW_UCHAR(x >> 24);
345
- s->func(s->context, b, 4);
346
- break;
349
+ typedef int stb_image_write_test[sizeof(stbiw_uint32)==4 ? 1 : -1];
350
+
351
+ static void stbiw__writefv(stbi__write_context *s, const char *fmt, va_list v)
352
+ {
353
+ while (*fmt) {
354
+ switch (*fmt++) {
355
+ case ' ': break;
356
+ case '1': { unsigned char x = STBIW_UCHAR(va_arg(v, int));
357
+ s->func(s->context,&x,1);
358
+ break; }
359
+ case '2': { int x = va_arg(v,int);
360
+ unsigned char b[2];
361
+ b[0] = STBIW_UCHAR(x);
362
+ b[1] = STBIW_UCHAR(x>>8);
363
+ s->func(s->context,b,2);
364
+ break; }
365
+ case '4': { stbiw_uint32 x = va_arg(v,int);
366
+ unsigned char b[4];
367
+ b[0]=STBIW_UCHAR(x);
368
+ b[1]=STBIW_UCHAR(x>>8);
369
+ b[2]=STBIW_UCHAR(x>>16);
370
+ b[3]=STBIW_UCHAR(x>>24);
371
+ s->func(s->context,b,4);
372
+ break; }
373
+ default:
374
+ STBIW_ASSERT(0);
375
+ return;
347
376
  }
348
- default:
349
- STBIW_ASSERT(0);
350
- return;
351
- }
352
- }
377
+ }
353
378
  }
354
379
 
355
- static void stbiw__writef(stbi__write_context *s, const char *fmt, ...) {
356
- va_list v;
357
- va_start(v, fmt);
358
- stbiw__writefv(s, fmt, v);
359
- va_end(v);
380
+ static void stbiw__writef(stbi__write_context *s, const char *fmt, ...)
381
+ {
382
+ va_list v;
383
+ va_start(v, fmt);
384
+ stbiw__writefv(s, fmt, v);
385
+ va_end(v);
360
386
  }
361
387
 
362
- static void stbiw__putc(stbi__write_context *s, unsigned char c) {
363
- s->func(s->context, &c, 1);
388
+ static void stbiw__putc(stbi__write_context *s, unsigned char c)
389
+ {
390
+ s->func(s->context, &c, 1);
364
391
  }
365
392
 
366
- static void stbiw__write3(stbi__write_context *s, unsigned char a,
367
- unsigned char b, unsigned char c) {
368
- unsigned char arr[3];
369
- arr[0] = a, arr[1] = b, arr[2] = c;
370
- s->func(s->context, arr, 3);
393
+ static void stbiw__write3(stbi__write_context *s, unsigned char a, unsigned char b, unsigned char c)
394
+ {
395
+ unsigned char arr[3];
396
+ arr[0] = a, arr[1] = b, arr[2] = c;
397
+ s->func(s->context, arr, 3);
371
398
  }
372
399
 
373
- static void stbiw__write_pixel(stbi__write_context *s, int rgb_dir, int comp,
374
- int write_alpha, int expand_mono,
375
- unsigned char *d) {
376
- unsigned char bg[3] = {255, 0, 255}, px[3];
377
- int k;
378
-
379
- if (write_alpha < 0) s->func(s->context, &d[comp - 1], 1);
380
-
381
- switch (comp) {
382
- case 2: // 2 pixels = mono + alpha, alpha is written separately, so same as
383
- // 1-channel case
384
- case 1:
385
- if (expand_mono)
386
- stbiw__write3(s, d[0], d[0], d[0]); // monochrome bmp
387
- else
388
- s->func(s->context, d, 1); // monochrome TGA
389
- break;
390
- case 4:
391
- if (!write_alpha) {
392
- // composite against pink background
393
- for (k = 0; k < 3; ++k) px[k] = bg[k] + ((d[k] - bg[k]) * d[3]) / 255;
394
- stbiw__write3(s, px[1 - rgb_dir], px[1], px[1 + rgb_dir]);
395
- break;
396
- }
397
- /* FALLTHROUGH */
398
- case 3:
399
- stbiw__write3(s, d[1 - rgb_dir], d[1], d[1 + rgb_dir]);
400
- break;
401
- }
402
- if (write_alpha > 0) s->func(s->context, &d[comp - 1], 1);
400
+ static void stbiw__write_pixel(stbi__write_context *s, int rgb_dir, int comp, int write_alpha, int expand_mono, unsigned char *d)
401
+ {
402
+ unsigned char bg[3] = { 255, 0, 255}, px[3];
403
+ int k;
404
+
405
+ if (write_alpha < 0)
406
+ s->func(s->context, &d[comp - 1], 1);
407
+
408
+ switch (comp) {
409
+ case 2: // 2 pixels = mono + alpha, alpha is written separately, so same as 1-channel case
410
+ case 1:
411
+ if (expand_mono)
412
+ stbiw__write3(s, d[0], d[0], d[0]); // monochrome bmp
413
+ else
414
+ s->func(s->context, d, 1); // monochrome TGA
415
+ break;
416
+ case 4:
417
+ if (!write_alpha) {
418
+ // composite against pink background
419
+ for (k = 0; k < 3; ++k)
420
+ px[k] = bg[k] + ((d[k] - bg[k]) * d[3]) / 255;
421
+ stbiw__write3(s, px[1 - rgb_dir], px[1], px[1 + rgb_dir]);
422
+ break;
423
+ }
424
+ /* FALLTHROUGH */
425
+ case 3:
426
+ stbiw__write3(s, d[1 - rgb_dir], d[1], d[1 + rgb_dir]);
427
+ break;
428
+ }
429
+ if (write_alpha > 0)
430
+ s->func(s->context, &d[comp - 1], 1);
403
431
  }
404
432
 
405
- static void stbiw__write_pixels(stbi__write_context *s, int rgb_dir, int vdir,
406
- int x, int y, int comp, void *data,
407
- int write_alpha, int scanline_pad,
408
- int expand_mono) {
409
- stbiw_uint32 zero = 0;
410
- int i, j, j_end;
411
-
412
- if (y <= 0) return;
413
-
414
- if (stbi__flip_vertically_on_write) vdir *= -1;
415
-
416
- if (vdir < 0)
417
- j_end = -1, j = y - 1;
418
- else
419
- j_end = y, j = 0;
420
-
421
- for (; j != j_end; j += vdir) {
422
- for (i = 0; i < x; ++i) {
423
- unsigned char *d = (unsigned char *)data + (j * x + i) * comp;
424
- stbiw__write_pixel(s, rgb_dir, comp, write_alpha, expand_mono, d);
425
- }
426
- s->func(s->context, &zero, scanline_pad);
427
- }
433
+ static void stbiw__write_pixels(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, void *data, int write_alpha, int scanline_pad, int expand_mono)
434
+ {
435
+ stbiw_uint32 zero = 0;
436
+ int i,j, j_end;
437
+
438
+ if (y <= 0)
439
+ return;
440
+
441
+ if (stbi__flip_vertically_on_write)
442
+ vdir *= -1;
443
+
444
+ if (vdir < 0)
445
+ j_end = -1, j = y-1;
446
+ else
447
+ j_end = y, j = 0;
448
+
449
+ for (; j != j_end; j += vdir) {
450
+ for (i=0; i < x; ++i) {
451
+ unsigned char *d = (unsigned char *) data + (j*x+i)*comp;
452
+ stbiw__write_pixel(s, rgb_dir, comp, write_alpha, expand_mono, d);
453
+ }
454
+ s->func(s->context, &zero, scanline_pad);
455
+ }
428
456
  }
429
457
 
430
- static int stbiw__outfile(stbi__write_context *s, int rgb_dir, int vdir, int x,
431
- int y, int comp, int expand_mono, void *data,
432
- int alpha, int pad, const char *fmt, ...) {
433
- if (y < 0 || x < 0) {
434
- return 0;
435
- } else {
436
- va_list v;
437
- va_start(v, fmt);
438
- stbiw__writefv(s, fmt, v);
439
- va_end(v);
440
- stbiw__write_pixels(s, rgb_dir, vdir, x, y, comp, data, alpha, pad,
441
- expand_mono);
442
- return 1;
443
- }
458
+ static int stbiw__outfile(stbi__write_context *s, int rgb_dir, int vdir, int x, int y, int comp, int expand_mono, void *data, int alpha, int pad, const char *fmt, ...)
459
+ {
460
+ if (y < 0 || x < 0) {
461
+ return 0;
462
+ } else {
463
+ va_list v;
464
+ va_start(v, fmt);
465
+ stbiw__writefv(s, fmt, v);
466
+ va_end(v);
467
+ stbiw__write_pixels(s,rgb_dir,vdir,x,y,comp,data,alpha,pad, expand_mono);
468
+ return 1;
469
+ }
444
470
  }
445
471
 
446
- static int stbi_write_bmp_core(stbi__write_context *s, int x, int y, int comp,
447
- const void *data) {
448
- int pad = (-x * 3) & 3;
449
- return stbiw__outfile(s, -1, -1, x, y, comp, 1, (void *)data, 0, pad,
450
- "11 4 22 4"
451
- "4 44 22 444444",
452
- 'B', 'M', 14 + 40 + (x * 3 + pad) * y, 0, 0,
453
- 14 + 40, // file header
454
- 40, x, y, 1, 24, 0, 0, 0, 0, 0, 0); // bitmap header
472
+ static int stbi_write_bmp_core(stbi__write_context *s, int x, int y, int comp, const void *data)
473
+ {
474
+ int pad = (-x*3) & 3;
475
+ return stbiw__outfile(s,-1,-1,x,y,comp,1,(void *) data,0,pad,
476
+ "11 4 22 4" "4 44 22 444444",
477
+ 'B', 'M', 14+40+(x*3+pad)*y, 0,0, 14+40, // file header
478
+ 40, x,y, 1,24, 0,0,0,0,0,0); // bitmap header
455
479
  }
456
480
 
457
- STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int x,
458
- int y, int comp, const void *data) {
459
- stbi__write_context s;
460
- stbi__start_write_callbacks(&s, func, context);
461
- return stbi_write_bmp_core(&s, x, y, comp, data);
481
+ STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data)
482
+ {
483
+ stbi__write_context s;
484
+ stbi__start_write_callbacks(&s, func, context);
485
+ return stbi_write_bmp_core(&s, x, y, comp, data);
462
486
  }
463
487
 
464
488
  #ifndef STBI_WRITE_NO_STDIO
465
- STBIWDEF int stbi_write_bmp(char const *filename, int x, int y, int comp,
466
- const void *data) {
467
- stbi__write_context s;
468
- if (stbi__start_write_file(&s, filename)) {
469
- int r = stbi_write_bmp_core(&s, x, y, comp, data);
470
- stbi__end_write_file(&s);
471
- return r;
472
- } else
473
- return 0;
489
+ STBIWDEF int stbi_write_bmp(char const *filename, int x, int y, int comp, const void *data)
490
+ {
491
+ stbi__write_context s;
492
+ if (stbi__start_write_file(&s,filename)) {
493
+ int r = stbi_write_bmp_core(&s, x, y, comp, data);
494
+ stbi__end_write_file(&s);
495
+ return r;
496
+ } else
497
+ return 0;
474
498
  }
475
- #endif //! STBI_WRITE_NO_STDIO
476
-
477
- static int stbi_write_tga_core(stbi__write_context *s, int x, int y, int comp,
478
- void *data) {
479
- int has_alpha = (comp == 2 || comp == 4);
480
- int colorbytes = has_alpha ? comp - 1 : comp;
481
- int format =
482
- colorbytes < 2
483
- ? 3
484
- : 2; // 3 color channels (RGB/RGBA) = 2, 1 color channel (Y/YA) = 3
485
-
486
- if (y < 0 || x < 0) return 0;
487
-
488
- if (!stbi_write_tga_with_rle) {
489
- return stbiw__outfile(s, -1, -1, x, y, comp, 0, (void *)data, has_alpha, 0,
490
- "111 221 2222 11", 0, 0, format, 0, 0, 0, 0, 0, x, y,
491
- (colorbytes + has_alpha) * 8, has_alpha * 8);
492
- } else {
493
- int i, j, k;
494
- int jend, jdir;
495
-
496
- stbiw__writef(s, "111 221 2222 11", 0, 0, format + 8, 0, 0, 0, 0, 0, x, y,
497
- (colorbytes + has_alpha) * 8, has_alpha * 8);
498
-
499
- if (stbi__flip_vertically_on_write) {
500
- j = 0;
501
- jend = y;
502
- jdir = 1;
503
- } else {
504
- j = y - 1;
505
- jend = -1;
506
- jdir = -1;
507
- }
508
- for (; j != jend; j += jdir) {
509
- unsigned char *row = (unsigned char *)data + j * x * comp;
510
- int len;
511
-
512
- for (i = 0; i < x; i += len) {
513
- unsigned char *begin = row + i * comp;
514
- int diff = 1;
515
- len = 1;
516
-
517
- if (i < x - 1) {
518
- ++len;
519
- diff = memcmp(begin, row + (i + 1) * comp, comp);
520
- if (diff) {
521
- const unsigned char *prev = begin;
522
- for (k = i + 2; k < x && len < 128; ++k) {
523
- if (memcmp(prev, row + k * comp, comp)) {
524
- prev += comp;
525
- ++len;
526
- } else {
527
- --len;
528
- break;
529
- }
499
+ #endif //!STBI_WRITE_NO_STDIO
500
+
501
+ static int stbi_write_tga_core(stbi__write_context *s, int x, int y, int comp, void *data)
502
+ {
503
+ int has_alpha = (comp == 2 || comp == 4);
504
+ int colorbytes = has_alpha ? comp-1 : comp;
505
+ int format = colorbytes < 2 ? 3 : 2; // 3 color channels (RGB/RGBA) = 2, 1 color channel (Y/YA) = 3
506
+
507
+ if (y < 0 || x < 0)
508
+ return 0;
509
+
510
+ if (!stbi_write_tga_with_rle) {
511
+ return stbiw__outfile(s, -1, -1, x, y, comp, 0, (void *) data, has_alpha, 0,
512
+ "111 221 2222 11", 0, 0, format, 0, 0, 0, 0, 0, x, y, (colorbytes + has_alpha) * 8, has_alpha * 8);
513
+ } else {
514
+ int i,j,k;
515
+ int jend, jdir;
516
+
517
+ stbiw__writef(s, "111 221 2222 11", 0,0,format+8, 0,0,0, 0,0,x,y, (colorbytes + has_alpha) * 8, has_alpha * 8);
518
+
519
+ if (stbi__flip_vertically_on_write) {
520
+ j = 0;
521
+ jend = y;
522
+ jdir = 1;
523
+ } else {
524
+ j = y-1;
525
+ jend = -1;
526
+ jdir = -1;
527
+ }
528
+ for (; j != jend; j += jdir) {
529
+ unsigned char *row = (unsigned char *) data + j * x * comp;
530
+ int len;
531
+
532
+ for (i = 0; i < x; i += len) {
533
+ unsigned char *begin = row + i * comp;
534
+ int diff = 1;
535
+ len = 1;
536
+
537
+ if (i < x - 1) {
538
+ ++len;
539
+ diff = memcmp(begin, row + (i + 1) * comp, comp);
540
+ if (diff) {
541
+ const unsigned char *prev = begin;
542
+ for (k = i + 2; k < x && len < 128; ++k) {
543
+ if (memcmp(prev, row + k * comp, comp)) {
544
+ prev += comp;
545
+ ++len;
546
+ } else {
547
+ --len;
548
+ break;
549
+ }
550
+ }
551
+ } else {
552
+ for (k = i + 2; k < x && len < 128; ++k) {
553
+ if (!memcmp(begin, row + k * comp, comp)) {
554
+ ++len;
555
+ } else {
556
+ break;
557
+ }
558
+ }
559
+ }
530
560
  }
531
- } else {
532
- for (k = i + 2; k < x && len < 128; ++k) {
533
- if (!memcmp(begin, row + k * comp, comp)) {
534
- ++len;
535
- } else {
536
- break;
537
- }
561
+
562
+ if (diff) {
563
+ unsigned char header = STBIW_UCHAR(len - 1);
564
+ s->func(s->context, &header, 1);
565
+ for (k = 0; k < len; ++k) {
566
+ stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin + k * comp);
567
+ }
568
+ } else {
569
+ unsigned char header = STBIW_UCHAR(len - 129);
570
+ s->func(s->context, &header, 1);
571
+ stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin);
538
572
  }
539
- }
540
- }
541
-
542
- if (diff) {
543
- unsigned char header = STBIW_UCHAR(len - 1);
544
- s->func(s->context, &header, 1);
545
- for (k = 0; k < len; ++k) {
546
- stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin + k * comp);
547
- }
548
- } else {
549
- unsigned char header = STBIW_UCHAR(len - 129);
550
- s->func(s->context, &header, 1);
551
- stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin);
552
- }
573
+ }
553
574
  }
554
- }
555
- }
556
- return 1;
575
+ }
576
+ return 1;
557
577
  }
558
578
 
559
- STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int x,
560
- int y, int comp, const void *data) {
561
- stbi__write_context s;
562
- stbi__start_write_callbacks(&s, func, context);
563
- return stbi_write_tga_core(&s, x, y, comp, (void *)data);
579
+ STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data)
580
+ {
581
+ stbi__write_context s;
582
+ stbi__start_write_callbacks(&s, func, context);
583
+ return stbi_write_tga_core(&s, x, y, comp, (void *) data);
564
584
  }
565
585
 
566
586
  #ifndef STBI_WRITE_NO_STDIO
567
- STBIWDEF int stbi_write_tga(char const *filename, int x, int y, int comp,
568
- const void *data) {
569
- stbi__write_context s;
570
- if (stbi__start_write_file(&s, filename)) {
571
- int r = stbi_write_tga_core(&s, x, y, comp, (void *)data);
572
- stbi__end_write_file(&s);
573
- return r;
574
- } else
575
- return 0;
587
+ STBIWDEF int stbi_write_tga(char const *filename, int x, int y, int comp, const void *data)
588
+ {
589
+ stbi__write_context s;
590
+ if (stbi__start_write_file(&s,filename)) {
591
+ int r = stbi_write_tga_core(&s, x, y, comp, (void *) data);
592
+ stbi__end_write_file(&s);
593
+ return r;
594
+ } else
595
+ return 0;
576
596
  }
577
597
  #endif
578
598
 
@@ -580,183 +600,176 @@ STBIWDEF int stbi_write_tga(char const *filename, int x, int y, int comp,
580
600
  // Radiance RGBE HDR writer
581
601
  // by Baldur Karlsson
582
602
 
583
- #define stbiw__max(a, b) ((a) > (b) ? (a) : (b))
603
+ #define stbiw__max(a, b) ((a) > (b) ? (a) : (b))
584
604
 
585
- void stbiw__linear_to_rgbe(unsigned char *rgbe, float *linear) {
586
- int exponent;
587
- float maxcomp = stbiw__max(linear[0], stbiw__max(linear[1], linear[2]));
605
+ static void stbiw__linear_to_rgbe(unsigned char *rgbe, float *linear)
606
+ {
607
+ int exponent;
608
+ float maxcomp = stbiw__max(linear[0], stbiw__max(linear[1], linear[2]));
588
609
 
589
- if (maxcomp < 1e-32f) {
590
- rgbe[0] = rgbe[1] = rgbe[2] = rgbe[3] = 0;
591
- } else {
592
- float normalize = (float)frexp(maxcomp, &exponent) * 256.0f / maxcomp;
610
+ if (maxcomp < 1e-32f) {
611
+ rgbe[0] = rgbe[1] = rgbe[2] = rgbe[3] = 0;
612
+ } else {
613
+ float normalize = (float) frexp(maxcomp, &exponent) * 256.0f/maxcomp;
593
614
 
594
- rgbe[0] = (unsigned char)(linear[0] * normalize);
595
- rgbe[1] = (unsigned char)(linear[1] * normalize);
596
- rgbe[2] = (unsigned char)(linear[2] * normalize);
597
- rgbe[3] = (unsigned char)(exponent + 128);
598
- }
615
+ rgbe[0] = (unsigned char)(linear[0] * normalize);
616
+ rgbe[1] = (unsigned char)(linear[1] * normalize);
617
+ rgbe[2] = (unsigned char)(linear[2] * normalize);
618
+ rgbe[3] = (unsigned char)(exponent + 128);
619
+ }
599
620
  }
600
621
 
601
- void stbiw__write_run_data(stbi__write_context *s, int length,
602
- unsigned char databyte) {
603
- unsigned char lengthbyte = STBIW_UCHAR(length + 128);
604
- STBIW_ASSERT(length + 128 <= 255);
605
- s->func(s->context, &lengthbyte, 1);
606
- s->func(s->context, &databyte, 1);
622
+ static void stbiw__write_run_data(stbi__write_context *s, int length, unsigned char databyte)
623
+ {
624
+ unsigned char lengthbyte = STBIW_UCHAR(length+128);
625
+ STBIW_ASSERT(length+128 <= 255);
626
+ s->func(s->context, &lengthbyte, 1);
627
+ s->func(s->context, &databyte, 1);
607
628
  }
608
629
 
609
- void stbiw__write_dump_data(stbi__write_context *s, int length,
610
- unsigned char *data) {
611
- unsigned char lengthbyte = STBIW_UCHAR(length);
612
- STBIW_ASSERT(
613
- length <=
614
- 128); // inconsistent with spec but consistent with official code
615
- s->func(s->context, &lengthbyte, 1);
616
- s->func(s->context, data, length);
630
+ static void stbiw__write_dump_data(stbi__write_context *s, int length, unsigned char *data)
631
+ {
632
+ unsigned char lengthbyte = STBIW_UCHAR(length);
633
+ STBIW_ASSERT(length <= 128); // inconsistent with spec but consistent with official code
634
+ s->func(s->context, &lengthbyte, 1);
635
+ s->func(s->context, data, length);
617
636
  }
618
637
 
619
- void stbiw__write_hdr_scanline(stbi__write_context *s, int width, int ncomp,
620
- unsigned char *scratch, float *scanline) {
621
- unsigned char scanlineheader[4] = {2, 2, 0, 0};
622
- unsigned char rgbe[4];
623
- float linear[3];
624
- int x;
625
-
626
- scanlineheader[2] = (width & 0xff00) >> 8;
627
- scanlineheader[3] = (width & 0x00ff);
628
-
629
- /* skip RLE for images too small or large */
630
- if (width < 8 || width >= 32768) {
631
- for (x = 0; x < width; x++) {
632
- switch (ncomp) {
633
- case 4: /* fallthrough */
634
- case 3:
635
- linear[2] = scanline[x * ncomp + 2];
636
- linear[1] = scanline[x * ncomp + 1];
637
- linear[0] = scanline[x * ncomp + 0];
638
- break;
639
- default:
640
- linear[0] = linear[1] = linear[2] = scanline[x * ncomp + 0];
641
- break;
638
+ static void stbiw__write_hdr_scanline(stbi__write_context *s, int width, int ncomp, unsigned char *scratch, float *scanline)
639
+ {
640
+ unsigned char scanlineheader[4] = { 2, 2, 0, 0 };
641
+ unsigned char rgbe[4];
642
+ float linear[3];
643
+ int x;
644
+
645
+ scanlineheader[2] = (width&0xff00)>>8;
646
+ scanlineheader[3] = (width&0x00ff);
647
+
648
+ /* skip RLE for images too small or large */
649
+ if (width < 8 || width >= 32768) {
650
+ for (x=0; x < width; x++) {
651
+ switch (ncomp) {
652
+ case 4: /* fallthrough */
653
+ case 3: linear[2] = scanline[x*ncomp + 2];
654
+ linear[1] = scanline[x*ncomp + 1];
655
+ linear[0] = scanline[x*ncomp + 0];
656
+ break;
657
+ default:
658
+ linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0];
659
+ break;
660
+ }
661
+ stbiw__linear_to_rgbe(rgbe, linear);
662
+ s->func(s->context, rgbe, 4);
642
663
  }
643
- stbiw__linear_to_rgbe(rgbe, linear);
644
- s->func(s->context, rgbe, 4);
645
- }
646
- } else {
647
- int c, r;
648
- /* encode into scratch buffer */
649
- for (x = 0; x < width; x++) {
650
- switch (ncomp) {
651
- case 4: /* fallthrough */
652
- case 3:
653
- linear[2] = scanline[x * ncomp + 2];
654
- linear[1] = scanline[x * ncomp + 1];
655
- linear[0] = scanline[x * ncomp + 0];
656
- break;
657
- default:
658
- linear[0] = linear[1] = linear[2] = scanline[x * ncomp + 0];
659
- break;
664
+ } else {
665
+ int c,r;
666
+ /* encode into scratch buffer */
667
+ for (x=0; x < width; x++) {
668
+ switch(ncomp) {
669
+ case 4: /* fallthrough */
670
+ case 3: linear[2] = scanline[x*ncomp + 2];
671
+ linear[1] = scanline[x*ncomp + 1];
672
+ linear[0] = scanline[x*ncomp + 0];
673
+ break;
674
+ default:
675
+ linear[0] = linear[1] = linear[2] = scanline[x*ncomp + 0];
676
+ break;
677
+ }
678
+ stbiw__linear_to_rgbe(rgbe, linear);
679
+ scratch[x + width*0] = rgbe[0];
680
+ scratch[x + width*1] = rgbe[1];
681
+ scratch[x + width*2] = rgbe[2];
682
+ scratch[x + width*3] = rgbe[3];
660
683
  }
661
- stbiw__linear_to_rgbe(rgbe, linear);
662
- scratch[x + width * 0] = rgbe[0];
663
- scratch[x + width * 1] = rgbe[1];
664
- scratch[x + width * 2] = rgbe[2];
665
- scratch[x + width * 3] = rgbe[3];
666
- }
667
-
668
- s->func(s->context, scanlineheader, 4);
669
-
670
- /* RLE each component separately */
671
- for (c = 0; c < 4; c++) {
672
- unsigned char *comp = &scratch[width * c];
673
-
674
- x = 0;
675
- while (x < width) {
676
- // find first run
677
- r = x;
678
- while (r + 2 < width) {
679
- if (comp[r] == comp[r + 1] && comp[r] == comp[r + 2]) break;
680
- ++r;
681
- }
682
- if (r + 2 >= width) r = width;
683
- // dump up to first run
684
- while (x < r) {
685
- int len = r - x;
686
- if (len > 128) len = 128;
687
- stbiw__write_dump_data(s, len, &comp[x]);
688
- x += len;
689
- }
690
- // if there's a run, output it
691
- if (r + 2 < width) { // same test as what we break out of in search
692
- // loop, so only true if we break'd
693
- // find next byte after run
694
- while (r < width && comp[r] == comp[x]) ++r;
695
- // output run up to r
696
- while (x < r) {
697
- int len = r - x;
698
- if (len > 127) len = 127;
699
- stbiw__write_run_data(s, len, comp[x]);
700
- x += len;
701
- }
702
- }
684
+
685
+ s->func(s->context, scanlineheader, 4);
686
+
687
+ /* RLE each component separately */
688
+ for (c=0; c < 4; c++) {
689
+ unsigned char *comp = &scratch[width*c];
690
+
691
+ x = 0;
692
+ while (x < width) {
693
+ // find first run
694
+ r = x;
695
+ while (r+2 < width) {
696
+ if (comp[r] == comp[r+1] && comp[r] == comp[r+2])
697
+ break;
698
+ ++r;
699
+ }
700
+ if (r+2 >= width)
701
+ r = width;
702
+ // dump up to first run
703
+ while (x < r) {
704
+ int len = r-x;
705
+ if (len > 128) len = 128;
706
+ stbiw__write_dump_data(s, len, &comp[x]);
707
+ x += len;
708
+ }
709
+ // if there's a run, output it
710
+ if (r+2 < width) { // same test as what we break out of in search loop, so only true if we break'd
711
+ // find next byte after run
712
+ while (r < width && comp[r] == comp[x])
713
+ ++r;
714
+ // output run up to r
715
+ while (x < r) {
716
+ int len = r-x;
717
+ if (len > 127) len = 127;
718
+ stbiw__write_run_data(s, len, comp[x]);
719
+ x += len;
720
+ }
721
+ }
722
+ }
703
723
  }
704
- }
705
- }
724
+ }
706
725
  }
707
726
 
708
- static int stbi_write_hdr_core(stbi__write_context *s, int x, int y, int comp,
709
- float *data) {
710
- if (y <= 0 || x <= 0 || data == NULL)
711
- return 0;
712
- else {
713
- // Each component is stored separately. Allocate scratch space for full
714
- // output scanline.
715
- unsigned char *scratch = (unsigned char *)STBIW_MALLOC(x * 4);
716
- int i, len;
717
- char buffer[128];
718
- char header[] =
719
- "#?RADIANCE\n# Written by stb_image_write.h\nFORMAT=32-bit_rle_rgbe\n";
720
- s->func(s->context, header, sizeof(header) - 1);
727
+ static int stbi_write_hdr_core(stbi__write_context *s, int x, int y, int comp, float *data)
728
+ {
729
+ if (y <= 0 || x <= 0 || data == NULL)
730
+ return 0;
731
+ else {
732
+ // Each component is stored separately. Allocate scratch space for full output scanline.
733
+ unsigned char *scratch = (unsigned char *) STBIW_MALLOC(x*4);
734
+ int i, len;
735
+ char buffer[128];
736
+ char header[] = "#?RADIANCE\n# Written by stb_image_write.h\nFORMAT=32-bit_rle_rgbe\n";
737
+ s->func(s->context, header, sizeof(header)-1);
721
738
 
722
739
  #ifdef STBI_MSC_SECURE_CRT
723
- len = sprintf_s(
724
- buffer, "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x);
740
+ len = sprintf_s(buffer, "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x);
725
741
  #else
726
- len = sprintf(buffer, "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n",
727
- y, x);
742
+ len = sprintf(buffer, "EXPOSURE= 1.0000000000000\n\n-Y %d +X %d\n", y, x);
728
743
  #endif
729
- s->func(s->context, buffer, len);
730
-
731
- for (i = 0; i < y; i++)
732
- stbiw__write_hdr_scanline(
733
- s, x, comp, scratch,
734
- data +
735
- comp * x * (stbi__flip_vertically_on_write ? y - 1 - i : i) * x);
736
- STBIW_FREE(scratch);
737
- return 1;
738
- }
744
+ s->func(s->context, buffer, len);
745
+
746
+ for(i=0; i < y; i++)
747
+ stbiw__write_hdr_scanline(s, x, comp, scratch, data + comp*x*(stbi__flip_vertically_on_write ? y-1-i : i));
748
+ STBIW_FREE(scratch);
749
+ return 1;
750
+ }
739
751
  }
740
752
 
741
- STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int x,
742
- int y, int comp, const float *data) {
743
- stbi__write_context s;
744
- stbi__start_write_callbacks(&s, func, context);
745
- return stbi_write_hdr_core(&s, x, y, comp, (float *)data);
753
+ STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const float *data)
754
+ {
755
+ stbi__write_context s;
756
+ stbi__start_write_callbacks(&s, func, context);
757
+ return stbi_write_hdr_core(&s, x, y, comp, (float *) data);
746
758
  }
747
759
 
748
760
  #ifndef STBI_WRITE_NO_STDIO
749
- STBIWDEF int stbi_write_hdr(char const *filename, int x, int y, int comp,
750
- const float *data) {
751
- stbi__write_context s;
752
- if (stbi__start_write_file(&s, filename)) {
753
- int r = stbi_write_hdr_core(&s, x, y, comp, (float *)data);
754
- stbi__end_write_file(&s);
755
- return r;
756
- } else
757
- return 0;
761
+ STBIWDEF int stbi_write_hdr(char const *filename, int x, int y, int comp, const float *data)
762
+ {
763
+ stbi__write_context s;
764
+ if (stbi__start_write_file(&s,filename)) {
765
+ int r = stbi_write_hdr_core(&s, x, y, comp, (float *) data);
766
+ stbi__end_write_file(&s);
767
+ return r;
768
+ } else
769
+ return 0;
758
770
  }
759
- #endif // STBI_WRITE_NO_STDIO
771
+ #endif // STBI_WRITE_NO_STDIO
772
+
760
773
 
761
774
  //////////////////////////////////////////////////////////////////////////////
762
775
  //
@@ -764,1009 +777,786 @@ STBIWDEF int stbi_write_hdr(char const *filename, int x, int y, int comp,
764
777
  //
765
778
 
766
779
  #ifndef STBIW_ZLIB_COMPRESS
767
- // stretchy buffer; stbiw__sbpush() == vector<>::push_back() -- stbiw__sbcount()
768
- // == vector<>::size()
769
- #define stbiw__sbraw(a) ((int *)(a)-2)
770
- #define stbiw__sbm(a) stbiw__sbraw(a)[0]
771
- #define stbiw__sbn(a) stbiw__sbraw(a)[1]
772
-
773
- #define stbiw__sbneedgrow(a, n) ((a) == 0 || stbiw__sbn(a) + n >= stbiw__sbm(a))
774
- #define stbiw__sbmaybegrow(a, n) \
775
- (stbiw__sbneedgrow(a, (n)) ? stbiw__sbgrow(a, n) : 0)
776
- #define stbiw__sbgrow(a, n) stbiw__sbgrowf((void **)&(a), (n), sizeof(*(a)))
777
-
778
- #define stbiw__sbpush(a, v) \
779
- (stbiw__sbmaybegrow(a, 1), (a)[stbiw__sbn(a)++] = (v))
780
- #define stbiw__sbcount(a) ((a) ? stbiw__sbn(a) : 0)
781
- #define stbiw__sbfree(a) ((a) ? STBIW_FREE(stbiw__sbraw(a)), 0 : 0)
782
-
783
- static void *stbiw__sbgrowf(void **arr, int increment, int itemsize) {
784
- int m = *arr ? 2 * stbiw__sbm(*arr) + increment : increment + 1;
785
- void *p = STBIW_REALLOC_SIZED(
786
- *arr ? stbiw__sbraw(*arr) : 0,
787
- *arr ? (stbiw__sbm(*arr) * itemsize + sizeof(int) * 2) : 0,
788
- itemsize * m + sizeof(int) * 2);
789
- STBIW_ASSERT(p);
790
- if (p) {
791
- if (!*arr) ((int *)p)[1] = 0;
792
- *arr = (void *)((int *)p + 2);
793
- stbiw__sbm(*arr) = m;
794
- }
795
- return *arr;
780
+ // stretchy buffer; stbiw__sbpush() == vector<>::push_back() -- stbiw__sbcount() == vector<>::size()
781
+ #define stbiw__sbraw(a) ((int *) (a) - 2)
782
+ #define stbiw__sbm(a) stbiw__sbraw(a)[0]
783
+ #define stbiw__sbn(a) stbiw__sbraw(a)[1]
784
+
785
+ #define stbiw__sbneedgrow(a,n) ((a)==0 || stbiw__sbn(a)+n >= stbiw__sbm(a))
786
+ #define stbiw__sbmaybegrow(a,n) (stbiw__sbneedgrow(a,(n)) ? stbiw__sbgrow(a,n) : 0)
787
+ #define stbiw__sbgrow(a,n) stbiw__sbgrowf((void **) &(a), (n), sizeof(*(a)))
788
+
789
+ #define stbiw__sbpush(a, v) (stbiw__sbmaybegrow(a,1), (a)[stbiw__sbn(a)++] = (v))
790
+ #define stbiw__sbcount(a) ((a) ? stbiw__sbn(a) : 0)
791
+ #define stbiw__sbfree(a) ((a) ? STBIW_FREE(stbiw__sbraw(a)),0 : 0)
792
+
793
+ static void *stbiw__sbgrowf(void **arr, int increment, int itemsize)
794
+ {
795
+ int m = *arr ? 2*stbiw__sbm(*arr)+increment : increment+1;
796
+ void *p = STBIW_REALLOC_SIZED(*arr ? stbiw__sbraw(*arr) : 0, *arr ? (stbiw__sbm(*arr)*itemsize + sizeof(int)*2) : 0, itemsize * m + sizeof(int)*2);
797
+ STBIW_ASSERT(p);
798
+ if (p) {
799
+ if (!*arr) ((int *) p)[1] = 0;
800
+ *arr = (void *) ((int *) p + 2);
801
+ stbiw__sbm(*arr) = m;
802
+ }
803
+ return *arr;
796
804
  }
797
805
 
798
- static unsigned char *stbiw__zlib_flushf(unsigned char *data,
799
- unsigned int *bitbuffer,
800
- int *bitcount) {
801
- while (*bitcount >= 8) {
802
- stbiw__sbpush(data, STBIW_UCHAR(*bitbuffer));
803
- *bitbuffer >>= 8;
804
- *bitcount -= 8;
805
- }
806
- return data;
806
+ static unsigned char *stbiw__zlib_flushf(unsigned char *data, unsigned int *bitbuffer, int *bitcount)
807
+ {
808
+ while (*bitcount >= 8) {
809
+ stbiw__sbpush(data, STBIW_UCHAR(*bitbuffer));
810
+ *bitbuffer >>= 8;
811
+ *bitcount -= 8;
812
+ }
813
+ return data;
807
814
  }
808
815
 
809
- static int stbiw__zlib_bitrev(int code, int codebits) {
810
- int res = 0;
811
- while (codebits--) {
812
- res = (res << 1) | (code & 1);
813
- code >>= 1;
814
- }
815
- return res;
816
+ static int stbiw__zlib_bitrev(int code, int codebits)
817
+ {
818
+ int res=0;
819
+ while (codebits--) {
820
+ res = (res << 1) | (code & 1);
821
+ code >>= 1;
822
+ }
823
+ return res;
816
824
  }
817
825
 
818
- static unsigned int stbiw__zlib_countm(unsigned char *a, unsigned char *b,
819
- int limit) {
820
- int i;
821
- for (i = 0; i < limit && i < 258; ++i)
822
- if (a[i] != b[i]) break;
823
- return i;
826
+ static unsigned int stbiw__zlib_countm(unsigned char *a, unsigned char *b, int limit)
827
+ {
828
+ int i;
829
+ for (i=0; i < limit && i < 258; ++i)
830
+ if (a[i] != b[i]) break;
831
+ return i;
824
832
  }
825
833
 
826
- static unsigned int stbiw__zhash(unsigned char *data) {
827
- stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16);
828
- hash ^= hash << 3;
829
- hash += hash >> 5;
830
- hash ^= hash << 4;
831
- hash += hash >> 17;
832
- hash ^= hash << 25;
833
- hash += hash >> 6;
834
- return hash;
834
+ static unsigned int stbiw__zhash(unsigned char *data)
835
+ {
836
+ stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16);
837
+ hash ^= hash << 3;
838
+ hash += hash >> 5;
839
+ hash ^= hash << 4;
840
+ hash += hash >> 17;
841
+ hash ^= hash << 25;
842
+ hash += hash >> 6;
843
+ return hash;
835
844
  }
836
845
 
837
846
  #define stbiw__zlib_flush() (out = stbiw__zlib_flushf(out, &bitbuf, &bitcount))
838
- #define stbiw__zlib_add(code, codebits) \
839
- (bitbuf |= (code) << bitcount, bitcount += (codebits), stbiw__zlib_flush())
840
- #define stbiw__zlib_huffa(b, c) stbiw__zlib_add(stbiw__zlib_bitrev(b, c), c)
847
+ #define stbiw__zlib_add(code,codebits) \
848
+ (bitbuf |= (code) << bitcount, bitcount += (codebits), stbiw__zlib_flush())
849
+ #define stbiw__zlib_huffa(b,c) stbiw__zlib_add(stbiw__zlib_bitrev(b,c),c)
841
850
  // default huffman tables
842
- #define stbiw__zlib_huff1(n) stbiw__zlib_huffa(0x30 + (n), 8)
843
- #define stbiw__zlib_huff2(n) stbiw__zlib_huffa(0x190 + (n)-144, 9)
844
- #define stbiw__zlib_huff3(n) stbiw__zlib_huffa(0 + (n)-256, 7)
845
- #define stbiw__zlib_huff4(n) stbiw__zlib_huffa(0xc0 + (n)-280, 8)
846
- #define stbiw__zlib_huff(n) \
847
- ((n) <= 143 ? stbiw__zlib_huff1(n) \
848
- : (n) <= 255 ? stbiw__zlib_huff2(n) \
849
- : (n) <= 279 ? stbiw__zlib_huff3(n) \
850
- : stbiw__zlib_huff4(n))
851
- #define stbiw__zlib_huffb(n) \
852
- ((n) <= 143 ? stbiw__zlib_huff1(n) : stbiw__zlib_huff2(n))
853
-
854
- #define stbiw__ZHASH 16384
855
-
856
- #endif // STBIW_ZLIB_COMPRESS
857
-
858
- unsigned char *stbi_zlib_compress(unsigned char *data, int data_len,
859
- int *out_len, int quality) {
851
+ #define stbiw__zlib_huff1(n) stbiw__zlib_huffa(0x30 + (n), 8)
852
+ #define stbiw__zlib_huff2(n) stbiw__zlib_huffa(0x190 + (n)-144, 9)
853
+ #define stbiw__zlib_huff3(n) stbiw__zlib_huffa(0 + (n)-256,7)
854
+ #define stbiw__zlib_huff4(n) stbiw__zlib_huffa(0xc0 + (n)-280,8)
855
+ #define stbiw__zlib_huff(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : (n) <= 255 ? stbiw__zlib_huff2(n) : (n) <= 279 ? stbiw__zlib_huff3(n) : stbiw__zlib_huff4(n))
856
+ #define stbiw__zlib_huffb(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : stbiw__zlib_huff2(n))
857
+
858
+ #define stbiw__ZHASH 16384
859
+
860
+ #endif // STBIW_ZLIB_COMPRESS
861
+
862
+ STBIWDEF unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality)
863
+ {
860
864
  #ifdef STBIW_ZLIB_COMPRESS
861
- // user provided a zlib compress implementation, use that
862
- return STBIW_ZLIB_COMPRESS(data, data_len, out_len, quality);
863
- #else // use builtin
864
- static unsigned short lengthc[] = {
865
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27,
866
- 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 259};
867
- static unsigned char lengtheb[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
868
- 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
869
- 4, 4, 4, 4, 5, 5, 5, 5, 0};
870
- static unsigned short distc[] = {
871
- 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33,
872
- 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537,
873
- 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 32768};
874
- static unsigned char disteb[] = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3,
875
- 4, 4, 5, 5, 6, 6, 7, 7, 8, 8,
876
- 9, 9, 10, 10, 11, 11, 12, 12, 13, 13};
877
- unsigned int bitbuf = 0;
878
- int i, j, bitcount = 0;
879
- unsigned char *out = NULL;
880
- unsigned char ***hash_table =
881
- (unsigned char ***)STBIW_MALLOC(stbiw__ZHASH * sizeof(char **));
882
- if (hash_table == NULL) return NULL;
883
- if (quality < 5) quality = 5;
884
-
885
- stbiw__sbpush(out, 0x78); // DEFLATE 32K window
886
- stbiw__sbpush(out, 0x5e); // FLEVEL = 1
887
- stbiw__zlib_add(1, 1); // BFINAL = 1
888
- stbiw__zlib_add(1, 2); // BTYPE = 1 -- fixed huffman
889
-
890
- for (i = 0; i < stbiw__ZHASH; ++i) hash_table[i] = NULL;
891
-
892
- i = 0;
893
- while (i < data_len - 3) {
894
- // hash next 3 bytes of data to be compressed
895
- int h = stbiw__zhash(data + i) & (stbiw__ZHASH - 1), best = 3;
896
- unsigned char *bestloc = 0;
897
- unsigned char **hlist = hash_table[h];
898
- int n = stbiw__sbcount(hlist);
899
- for (j = 0; j < n; ++j) {
900
- if (hlist[j] - data > i - 32768) { // if entry lies within window
901
- int d = stbiw__zlib_countm(hlist[j], data + i, data_len - i);
902
- if (d >= best) best = d, bestloc = hlist[j];
865
+ // user provided a zlib compress implementation, use that
866
+ return STBIW_ZLIB_COMPRESS(data, data_len, out_len, quality);
867
+ #else // use builtin
868
+ static unsigned short lengthc[] = { 3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258, 259 };
869
+ static unsigned char lengtheb[]= { 0,0,0,0,0,0,0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0 };
870
+ static unsigned short distc[] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577, 32768 };
871
+ static unsigned char disteb[] = { 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13 };
872
+ unsigned int bitbuf=0;
873
+ int i,j, bitcount=0;
874
+ unsigned char *out = NULL;
875
+ unsigned char ***hash_table = (unsigned char***) STBIW_MALLOC(stbiw__ZHASH * sizeof(char**));
876
+ if (hash_table == NULL)
877
+ return NULL;
878
+ if (quality < 5) quality = 5;
879
+
880
+ stbiw__sbpush(out, 0x78); // DEFLATE 32K window
881
+ stbiw__sbpush(out, 0x5e); // FLEVEL = 1
882
+ stbiw__zlib_add(1,1); // BFINAL = 1
883
+ stbiw__zlib_add(1,2); // BTYPE = 1 -- fixed huffman
884
+
885
+ for (i=0; i < stbiw__ZHASH; ++i)
886
+ hash_table[i] = NULL;
887
+
888
+ i=0;
889
+ while (i < data_len-3) {
890
+ // hash next 3 bytes of data to be compressed
891
+ int h = stbiw__zhash(data+i)&(stbiw__ZHASH-1), best=3;
892
+ unsigned char *bestloc = 0;
893
+ unsigned char **hlist = hash_table[h];
894
+ int n = stbiw__sbcount(hlist);
895
+ for (j=0; j < n; ++j) {
896
+ if (hlist[j]-data > i-32768) { // if entry lies within window
897
+ int d = stbiw__zlib_countm(hlist[j], data+i, data_len-i);
898
+ if (d >= best) best=d,bestloc=hlist[j];
899
+ }
903
900
  }
904
- }
905
- // when hash table entry is too long, delete half the entries
906
- if (hash_table[h] && stbiw__sbn(hash_table[h]) == 2 * quality) {
907
- STBIW_MEMMOVE(hash_table[h], hash_table[h] + quality,
908
- sizeof(hash_table[h][0]) * quality);
909
- stbiw__sbn(hash_table[h]) = quality;
910
- }
911
- stbiw__sbpush(hash_table[h], data + i);
912
-
913
- if (bestloc) {
914
- // "lazy matching" - check match at *next* byte, and if it's better, do
915
- // cur byte as literal
916
- h = stbiw__zhash(data + i + 1) & (stbiw__ZHASH - 1);
917
- hlist = hash_table[h];
918
- n = stbiw__sbcount(hlist);
919
- for (j = 0; j < n; ++j) {
920
- if (hlist[j] - data > i - 32767) {
921
- int e = stbiw__zlib_countm(hlist[j], data + i + 1, data_len - i - 1);
922
- if (e > best) { // if next match is better, bail on current match
923
- bestloc = NULL;
924
- break;
925
- }
926
- }
901
+ // when hash table entry is too long, delete half the entries
902
+ if (hash_table[h] && stbiw__sbn(hash_table[h]) == 2*quality) {
903
+ STBIW_MEMMOVE(hash_table[h], hash_table[h]+quality, sizeof(hash_table[h][0])*quality);
904
+ stbiw__sbn(hash_table[h]) = quality;
905
+ }
906
+ stbiw__sbpush(hash_table[h],data+i);
907
+
908
+ if (bestloc) {
909
+ // "lazy matching" - check match at *next* byte, and if it's better, do cur byte as literal
910
+ h = stbiw__zhash(data+i+1)&(stbiw__ZHASH-1);
911
+ hlist = hash_table[h];
912
+ n = stbiw__sbcount(hlist);
913
+ for (j=0; j < n; ++j) {
914
+ if (hlist[j]-data > i-32767) {
915
+ int e = stbiw__zlib_countm(hlist[j], data+i+1, data_len-i-1);
916
+ if (e > best) { // if next match is better, bail on current match
917
+ bestloc = NULL;
918
+ break;
919
+ }
920
+ }
921
+ }
927
922
  }
928
- }
929
-
930
- if (bestloc) {
931
- int d = (int)(data + i - bestloc); // distance back
932
- STBIW_ASSERT(d <= 32767 && best <= 258);
933
- for (j = 0; best > lengthc[j + 1] - 1; ++j)
934
- ;
935
- stbiw__zlib_huff(j + 257);
936
- if (lengtheb[j]) stbiw__zlib_add(best - lengthc[j], lengtheb[j]);
937
- for (j = 0; d > distc[j + 1] - 1; ++j)
938
- ;
939
- stbiw__zlib_add(stbiw__zlib_bitrev(j, 5), 5);
940
- if (disteb[j]) stbiw__zlib_add(d - distc[j], disteb[j]);
941
- i += best;
942
- } else {
923
+
924
+ if (bestloc) {
925
+ int d = (int) (data+i - bestloc); // distance back
926
+ STBIW_ASSERT(d <= 32767 && best <= 258);
927
+ for (j=0; best > lengthc[j+1]-1; ++j);
928
+ stbiw__zlib_huff(j+257);
929
+ if (lengtheb[j]) stbiw__zlib_add(best - lengthc[j], lengtheb[j]);
930
+ for (j=0; d > distc[j+1]-1; ++j);
931
+ stbiw__zlib_add(stbiw__zlib_bitrev(j,5),5);
932
+ if (disteb[j]) stbiw__zlib_add(d - distc[j], disteb[j]);
933
+ i += best;
934
+ } else {
935
+ stbiw__zlib_huffb(data[i]);
936
+ ++i;
937
+ }
938
+ }
939
+ // write out final bytes
940
+ for (;i < data_len; ++i)
943
941
  stbiw__zlib_huffb(data[i]);
944
- ++i;
945
- }
946
- }
947
- // write out final bytes
948
- for (; i < data_len; ++i) stbiw__zlib_huffb(data[i]);
949
- stbiw__zlib_huff(256); // end of block
950
- // pad with 0 bits to byte boundary
951
- while (bitcount) stbiw__zlib_add(0, 1);
952
-
953
- for (i = 0; i < stbiw__ZHASH; ++i) (void)stbiw__sbfree(hash_table[i]);
954
- STBIW_FREE(hash_table);
955
-
956
- {
957
- // compute adler32 on input
958
- unsigned int s1 = 1, s2 = 0;
959
- int blocklen = (int)(data_len % 5552);
960
- j = 0;
961
- while (j < data_len) {
962
- for (i = 0; i < blocklen; ++i) s1 += data[j + i], s2 += s1;
963
- s1 %= 65521, s2 %= 65521;
964
- j += blocklen;
965
- blocklen = 5552;
966
- }
967
- stbiw__sbpush(out, STBIW_UCHAR(s2 >> 8));
968
- stbiw__sbpush(out, STBIW_UCHAR(s2));
969
- stbiw__sbpush(out, STBIW_UCHAR(s1 >> 8));
970
- stbiw__sbpush(out, STBIW_UCHAR(s1));
971
- }
972
- *out_len = stbiw__sbn(out);
973
- // make returned pointer freeable
974
- STBIW_MEMMOVE(stbiw__sbraw(out), out, *out_len);
975
- return (unsigned char *)stbiw__sbraw(out);
976
- #endif // STBIW_ZLIB_COMPRESS
942
+ stbiw__zlib_huff(256); // end of block
943
+ // pad with 0 bits to byte boundary
944
+ while (bitcount)
945
+ stbiw__zlib_add(0,1);
946
+
947
+ for (i=0; i < stbiw__ZHASH; ++i)
948
+ (void) stbiw__sbfree(hash_table[i]);
949
+ STBIW_FREE(hash_table);
950
+
951
+ {
952
+ // compute adler32 on input
953
+ unsigned int s1=1, s2=0;
954
+ int blocklen = (int) (data_len % 5552);
955
+ j=0;
956
+ while (j < data_len) {
957
+ for (i=0; i < blocklen; ++i) s1 += data[j+i], s2 += s1;
958
+ s1 %= 65521, s2 %= 65521;
959
+ j += blocklen;
960
+ blocklen = 5552;
961
+ }
962
+ stbiw__sbpush(out, STBIW_UCHAR(s2 >> 8));
963
+ stbiw__sbpush(out, STBIW_UCHAR(s2));
964
+ stbiw__sbpush(out, STBIW_UCHAR(s1 >> 8));
965
+ stbiw__sbpush(out, STBIW_UCHAR(s1));
966
+ }
967
+ *out_len = stbiw__sbn(out);
968
+ // make returned pointer freeable
969
+ STBIW_MEMMOVE(stbiw__sbraw(out), out, *out_len);
970
+ return (unsigned char *) stbiw__sbraw(out);
971
+ #endif // STBIW_ZLIB_COMPRESS
977
972
  }
978
973
 
979
- static unsigned int stbiw__crc32(unsigned char *buffer, int len) {
980
- static unsigned int crc_table[256] = {
981
- 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
982
- 0xE963A535, 0x9E6495A3, 0x0eDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
983
- 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
984
- 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
985
- 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
986
- 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
987
- 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
988
- 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
989
- 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
990
- 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
991
- 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
992
- 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
993
- 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
994
- 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
995
- 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
996
- 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
997
- 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
998
- 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
999
- 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
1000
- 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
1001
- 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
1002
- 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
1003
- 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
1004
- 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
1005
- 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
1006
- 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
1007
- 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
1008
- 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
1009
- 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
1010
- 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
1011
- 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
1012
- 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
1013
- 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
1014
- 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
1015
- 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
1016
- 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
1017
- 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
1018
- 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
1019
- 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
1020
- 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
1021
- 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
1022
- 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
1023
- 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};
1024
-
1025
- unsigned int crc = ~0u;
1026
- int i;
1027
- for (i = 0; i < len; ++i)
1028
- crc = (crc >> 8) ^ crc_table[buffer[i] ^ (crc & 0xff)];
1029
- return ~crc;
974
+ static unsigned int stbiw__crc32(unsigned char *buffer, int len)
975
+ {
976
+ #ifdef STBIW_CRC32
977
+ return STBIW_CRC32(buffer, len);
978
+ #else
979
+ static unsigned int crc_table[256] =
980
+ {
981
+ 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
982
+ 0x0eDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
983
+ 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
984
+ 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
985
+ 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
986
+ 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
987
+ 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
988
+ 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
989
+ 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
990
+ 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
991
+ 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
992
+ 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
993
+ 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
994
+ 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
995
+ 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
996
+ 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
997
+ 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
998
+ 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
999
+ 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
1000
+ 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
1001
+ 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
1002
+ 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
1003
+ 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
1004
+ 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
1005
+ 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
1006
+ 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
1007
+ 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
1008
+ 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
1009
+ 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
1010
+ 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
1011
+ 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
1012
+ 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
1013
+ };
1014
+
1015
+ unsigned int crc = ~0u;
1016
+ int i;
1017
+ for (i=0; i < len; ++i)
1018
+ crc = (crc >> 8) ^ crc_table[buffer[i] ^ (crc & 0xff)];
1019
+ return ~crc;
1020
+ #endif
1030
1021
  }
1031
1022
 
1032
- #define stbiw__wpng4(o, a, b, c, d) \
1033
- ((o)[0] = STBIW_UCHAR(a), (o)[1] = STBIW_UCHAR(b), (o)[2] = STBIW_UCHAR(c), \
1034
- (o)[3] = STBIW_UCHAR(d), (o) += 4)
1035
- #define stbiw__wp32(data, v) \
1036
- stbiw__wpng4(data, (v) >> 24, (v) >> 16, (v) >> 8, (v));
1037
- #define stbiw__wptag(data, s) stbiw__wpng4(data, s[0], s[1], s[2], s[3])
1023
+ #define stbiw__wpng4(o,a,b,c,d) ((o)[0]=STBIW_UCHAR(a),(o)[1]=STBIW_UCHAR(b),(o)[2]=STBIW_UCHAR(c),(o)[3]=STBIW_UCHAR(d),(o)+=4)
1024
+ #define stbiw__wp32(data,v) stbiw__wpng4(data, (v)>>24,(v)>>16,(v)>>8,(v));
1025
+ #define stbiw__wptag(data,s) stbiw__wpng4(data, s[0],s[1],s[2],s[3])
1038
1026
 
1039
- static void stbiw__wpcrc(unsigned char **data, int len) {
1040
- unsigned int crc = stbiw__crc32(*data - len - 4, len + 4);
1041
- stbiw__wp32(*data, crc);
1027
+ static void stbiw__wpcrc(unsigned char **data, int len)
1028
+ {
1029
+ unsigned int crc = stbiw__crc32(*data - len - 4, len+4);
1030
+ stbiw__wp32(*data, crc);
1042
1031
  }
1043
1032
 
1044
- static unsigned char stbiw__paeth(int a, int b, int c) {
1045
- int p = a + b - c, pa = abs(p - a), pb = abs(p - b), pc = abs(p - c);
1046
- if (pa <= pb && pa <= pc) return STBIW_UCHAR(a);
1047
- if (pb <= pc) return STBIW_UCHAR(b);
1048
- return STBIW_UCHAR(c);
1033
+ static unsigned char stbiw__paeth(int a, int b, int c)
1034
+ {
1035
+ int p = a + b - c, pa = abs(p-a), pb = abs(p-b), pc = abs(p-c);
1036
+ if (pa <= pb && pa <= pc) return STBIW_UCHAR(a);
1037
+ if (pb <= pc) return STBIW_UCHAR(b);
1038
+ return STBIW_UCHAR(c);
1049
1039
  }
1050
1040
 
1051
1041
  // @OPTIMIZE: provide an option that always forces left-predict or paeth predict
1052
- static void stbiw__encode_png_line(unsigned char *pixels, int stride_bytes,
1053
- int width, int height, int y, int n,
1054
- int filter_type, signed char *line_buffer) {
1055
- static int mapping[] = {0, 1, 2, 3, 4};
1056
- static int firstmap[] = {0, 1, 0, 5, 6};
1057
- int *mymap = (y != 0) ? mapping : firstmap;
1058
- int i;
1059
- int type = mymap[filter_type];
1060
- unsigned char *z =
1061
- pixels +
1062
- stride_bytes * (stbi__flip_vertically_on_write ? height - 1 - y : y);
1063
- int signed_stride =
1064
- stbi__flip_vertically_on_write ? -stride_bytes : stride_bytes;
1065
- for (i = 0; i < n; ++i) {
1066
- switch (type) {
1067
- case 0:
1068
- line_buffer[i] = z[i];
1069
- break;
1070
- case 1:
1071
- line_buffer[i] = z[i];
1072
- break;
1073
- case 2:
1074
- line_buffer[i] = z[i] - z[i - signed_stride];
1075
- break;
1076
- case 3:
1077
- line_buffer[i] = z[i] - (z[i - signed_stride] >> 1);
1078
- break;
1079
- case 4:
1080
- line_buffer[i] =
1081
- (signed char)(z[i] - stbiw__paeth(0, z[i - signed_stride], 0));
1082
- break;
1083
- case 5:
1084
- line_buffer[i] = z[i];
1085
- break;
1086
- case 6:
1087
- line_buffer[i] = z[i];
1088
- break;
1089
- }
1090
- }
1091
- for (i = n; i < width * n; ++i) {
1092
- switch (type) {
1093
- case 0:
1094
- line_buffer[i] = z[i];
1095
- break;
1096
- case 1:
1097
- line_buffer[i] = z[i] - z[i - n];
1098
- break;
1099
- case 2:
1100
- line_buffer[i] = z[i] - z[i - signed_stride];
1101
- break;
1102
- case 3:
1103
- line_buffer[i] = z[i] - ((z[i - n] + z[i - signed_stride]) >> 1);
1104
- break;
1105
- case 4:
1106
- line_buffer[i] = z[i] - stbiw__paeth(z[i - n], z[i - signed_stride],
1107
- z[i - signed_stride - n]);
1108
- break;
1109
- case 5:
1110
- line_buffer[i] = z[i] - (z[i - n] >> 1);
1111
- break;
1112
- case 6:
1113
- line_buffer[i] = z[i] - stbiw__paeth(z[i - n], 0, 0);
1114
- break;
1115
- }
1116
- }
1042
+ static void stbiw__encode_png_line(unsigned char *pixels, int stride_bytes, int width, int height, int y, int n, int filter_type, signed char *line_buffer)
1043
+ {
1044
+ static int mapping[] = { 0,1,2,3,4 };
1045
+ static int firstmap[] = { 0,1,0,5,6 };
1046
+ int *mymap = (y != 0) ? mapping : firstmap;
1047
+ int i;
1048
+ int type = mymap[filter_type];
1049
+ unsigned char *z = pixels + stride_bytes * (stbi__flip_vertically_on_write ? height-1-y : y);
1050
+ int signed_stride = stbi__flip_vertically_on_write ? -stride_bytes : stride_bytes;
1051
+
1052
+ if (type==0) {
1053
+ memcpy(line_buffer, z, width*n);
1054
+ return;
1055
+ }
1056
+
1057
+ // first loop isn't optimized since it's just one pixel
1058
+ for (i = 0; i < n; ++i) {
1059
+ switch (type) {
1060
+ case 1: line_buffer[i] = z[i]; break;
1061
+ case 2: line_buffer[i] = z[i] - z[i-signed_stride]; break;
1062
+ case 3: line_buffer[i] = z[i] - (z[i-signed_stride]>>1); break;
1063
+ case 4: line_buffer[i] = (signed char) (z[i] - stbiw__paeth(0,z[i-signed_stride],0)); break;
1064
+ case 5: line_buffer[i] = z[i]; break;
1065
+ case 6: line_buffer[i] = z[i]; break;
1066
+ }
1067
+ }
1068
+ switch (type) {
1069
+ case 1: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-n]; break;
1070
+ case 2: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - z[i-signed_stride]; break;
1071
+ case 3: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - ((z[i-n] + z[i-signed_stride])>>1); break;
1072
+ case 4: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], z[i-signed_stride], z[i-signed_stride-n]); break;
1073
+ case 5: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - (z[i-n]>>1); break;
1074
+ case 6: for (i=n; i < width*n; ++i) line_buffer[i] = z[i] - stbiw__paeth(z[i-n], 0,0); break;
1075
+ }
1117
1076
  }
1118
1077
 
1119
- unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes,
1120
- int x, int y, int n, int *out_len) {
1121
- int force_filter = stbi_write_force_png_filter;
1122
- int ctype[5] = {-1, 0, 4, 2, 6};
1123
- unsigned char sig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
1124
- unsigned char *out, *o, *filt, *zlib;
1125
- signed char *line_buffer;
1126
- int j, zlen;
1127
-
1128
- if (stride_bytes == 0) stride_bytes = x * n;
1129
-
1130
- if (force_filter >= 5) {
1131
- force_filter = -1;
1132
- }
1133
-
1134
- filt = (unsigned char *)STBIW_MALLOC((x * n + 1) * y);
1135
- if (!filt) return 0;
1136
- line_buffer = (signed char *)STBIW_MALLOC(x * n);
1137
- if (!line_buffer) {
1138
- STBIW_FREE(filt);
1139
- return 0;
1140
- }
1141
- for (j = 0; j < y; ++j) {
1142
- int filter_type;
1143
- if (force_filter > -1) {
1144
- filter_type = force_filter;
1145
- stbiw__encode_png_line(pixels, stride_bytes, x, y, j, n, force_filter,
1146
- line_buffer);
1147
- } else { // Estimate the best filter by running through all of them:
1148
- int best_filter = 0, best_filter_val = 0x7fffffff, est, i;
1149
- for (filter_type = 0; filter_type < 5; filter_type++) {
1150
- stbiw__encode_png_line(pixels, stride_bytes, x, y, j, n, filter_type,
1151
- line_buffer);
1152
-
1153
- // Estimate the entropy of the line using this filter; the less, the
1154
- // better.
1155
- est = 0;
1156
- for (i = 0; i < x * n; ++i) {
1157
- est += abs((signed char)line_buffer[i]);
1158
- }
1159
- if (est < best_filter_val) {
1160
- best_filter_val = est;
1161
- best_filter = filter_type;
1162
- }
1163
- }
1164
- if (filter_type != best_filter) { // If the last iteration already got us
1165
- // the best filter, don't redo it
1166
- stbiw__encode_png_line(pixels, stride_bytes, x, y, j, n, best_filter,
1167
- line_buffer);
1168
- filter_type = best_filter;
1078
+ STBIWDEF unsigned char *stbi_write_png_to_mem(const unsigned char *pixels, int stride_bytes, int x, int y, int n, int *out_len)
1079
+ {
1080
+ int force_filter = stbi_write_force_png_filter;
1081
+ int ctype[5] = { -1, 0, 4, 2, 6 };
1082
+ unsigned char sig[8] = { 137,80,78,71,13,10,26,10 };
1083
+ unsigned char *out,*o, *filt, *zlib;
1084
+ signed char *line_buffer;
1085
+ int j,zlen;
1086
+
1087
+ if (stride_bytes == 0)
1088
+ stride_bytes = x * n;
1089
+
1090
+ if (force_filter >= 5) {
1091
+ force_filter = -1;
1092
+ }
1093
+
1094
+ filt = (unsigned char *) STBIW_MALLOC((x*n+1) * y); if (!filt) return 0;
1095
+ line_buffer = (signed char *) STBIW_MALLOC(x * n); if (!line_buffer) { STBIW_FREE(filt); return 0; }
1096
+ for (j=0; j < y; ++j) {
1097
+ int filter_type;
1098
+ if (force_filter > -1) {
1099
+ filter_type = force_filter;
1100
+ stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, force_filter, line_buffer);
1101
+ } else { // Estimate the best filter by running through all of them:
1102
+ int best_filter = 0, best_filter_val = 0x7fffffff, est, i;
1103
+ for (filter_type = 0; filter_type < 5; filter_type++) {
1104
+ stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, filter_type, line_buffer);
1105
+
1106
+ // Estimate the entropy of the line using this filter; the less, the better.
1107
+ est = 0;
1108
+ for (i = 0; i < x*n; ++i) {
1109
+ est += abs((signed char) line_buffer[i]);
1110
+ }
1111
+ if (est < best_filter_val) {
1112
+ best_filter_val = est;
1113
+ best_filter = filter_type;
1114
+ }
1115
+ }
1116
+ if (filter_type != best_filter) { // If the last iteration already got us the best filter, don't redo it
1117
+ stbiw__encode_png_line((unsigned char*)(pixels), stride_bytes, x, y, j, n, best_filter, line_buffer);
1118
+ filter_type = best_filter;
1119
+ }
1169
1120
  }
1170
- }
1171
- // when we get here, filter_type contains the filter type, and line_buffer
1172
- // contains the data
1173
- filt[j * (x * n + 1)] = (unsigned char)filter_type;
1174
- STBIW_MEMMOVE(filt + j * (x * n + 1) + 1, line_buffer, x * n);
1175
- }
1176
- STBIW_FREE(line_buffer);
1177
- zlib = stbi_zlib_compress(filt, y * (x * n + 1), &zlen,
1178
- stbi_write_png_compression_level);
1179
- STBIW_FREE(filt);
1180
- if (!zlib) return 0;
1181
-
1182
- // each tag requires 12 bytes of overhead
1183
- out = (unsigned char *)STBIW_MALLOC(8 + 12 + 13 + 12 + zlen + 12);
1184
- if (!out) return 0;
1185
- *out_len = 8 + 12 + 13 + 12 + zlen + 12;
1186
-
1187
- o = out;
1188
- STBIW_MEMMOVE(o, sig, 8);
1189
- o += 8;
1190
- stbiw__wp32(o, 13); // header length
1191
- stbiw__wptag(o, "IHDR");
1192
- stbiw__wp32(o, x);
1193
- stbiw__wp32(o, y);
1194
- *o++ = 8;
1195
- *o++ = STBIW_UCHAR(ctype[n]);
1196
- *o++ = 0;
1197
- *o++ = 0;
1198
- *o++ = 0;
1199
- stbiw__wpcrc(&o, 13);
1200
-
1201
- stbiw__wp32(o, zlen);
1202
- stbiw__wptag(o, "IDAT");
1203
- STBIW_MEMMOVE(o, zlib, zlen);
1204
- o += zlen;
1205
- STBIW_FREE(zlib);
1206
- stbiw__wpcrc(&o, zlen);
1207
-
1208
- stbiw__wp32(o, 0);
1209
- stbiw__wptag(o, "IEND");
1210
- stbiw__wpcrc(&o, 0);
1211
-
1212
- STBIW_ASSERT(o == out + *out_len);
1213
-
1214
- return out;
1121
+ // when we get here, filter_type contains the filter type, and line_buffer contains the data
1122
+ filt[j*(x*n+1)] = (unsigned char) filter_type;
1123
+ STBIW_MEMMOVE(filt+j*(x*n+1)+1, line_buffer, x*n);
1124
+ }
1125
+ STBIW_FREE(line_buffer);
1126
+ zlib = stbi_zlib_compress(filt, y*( x*n+1), &zlen, stbi_write_png_compression_level);
1127
+ STBIW_FREE(filt);
1128
+ if (!zlib) return 0;
1129
+
1130
+ // each tag requires 12 bytes of overhead
1131
+ out = (unsigned char *) STBIW_MALLOC(8 + 12+13 + 12+zlen + 12);
1132
+ if (!out) return 0;
1133
+ *out_len = 8 + 12+13 + 12+zlen + 12;
1134
+
1135
+ o=out;
1136
+ STBIW_MEMMOVE(o,sig,8); o+= 8;
1137
+ stbiw__wp32(o, 13); // header length
1138
+ stbiw__wptag(o, "IHDR");
1139
+ stbiw__wp32(o, x);
1140
+ stbiw__wp32(o, y);
1141
+ *o++ = 8;
1142
+ *o++ = STBIW_UCHAR(ctype[n]);
1143
+ *o++ = 0;
1144
+ *o++ = 0;
1145
+ *o++ = 0;
1146
+ stbiw__wpcrc(&o,13);
1147
+
1148
+ stbiw__wp32(o, zlen);
1149
+ stbiw__wptag(o, "IDAT");
1150
+ STBIW_MEMMOVE(o, zlib, zlen);
1151
+ o += zlen;
1152
+ STBIW_FREE(zlib);
1153
+ stbiw__wpcrc(&o, zlen);
1154
+
1155
+ stbiw__wp32(o,0);
1156
+ stbiw__wptag(o, "IEND");
1157
+ stbiw__wpcrc(&o,0);
1158
+
1159
+ STBIW_ASSERT(o == out + *out_len);
1160
+
1161
+ return out;
1215
1162
  }
1216
1163
 
1217
1164
  #ifndef STBI_WRITE_NO_STDIO
1218
- STBIWDEF int stbi_write_png(char const *filename, int x, int y, int comp,
1219
- const void *data, int stride_bytes) {
1220
- FILE *f;
1221
- int len;
1222
- unsigned char *png = stbi_write_png_to_mem((unsigned char *)data,
1223
- stride_bytes, x, y, comp, &len);
1224
- if (png == NULL) return 0;
1225
- #ifdef STBI_MSC_SECURE_CRT
1226
- if (fopen_s(&f, filename, "wb")) f = NULL;
1227
- #else
1228
- f = fopen(filename, "wb");
1229
- #endif
1230
- if (!f) {
1231
- STBIW_FREE(png);
1232
- return 0;
1233
- }
1234
- fwrite(png, 1, len, f);
1235
- fclose(f);
1236
- STBIW_FREE(png);
1237
- return 1;
1165
+ STBIWDEF int stbi_write_png(char const *filename, int x, int y, int comp, const void *data, int stride_bytes)
1166
+ {
1167
+ FILE *f;
1168
+ int len;
1169
+ unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len);
1170
+ if (png == NULL) return 0;
1171
+
1172
+ f = stbiw__fopen(filename, "wb");
1173
+ if (!f) { STBIW_FREE(png); return 0; }
1174
+ fwrite(png, 1, len, f);
1175
+ fclose(f);
1176
+ STBIW_FREE(png);
1177
+ return 1;
1238
1178
  }
1239
1179
  #endif
1240
1180
 
1241
- STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int x,
1242
- int y, int comp, const void *data,
1243
- int stride_bytes) {
1244
- int len;
1245
- unsigned char *png = stbi_write_png_to_mem((unsigned char *)data,
1246
- stride_bytes, x, y, comp, &len);
1247
- if (png == NULL) return 0;
1248
- func(context, png, len);
1249
- STBIW_FREE(png);
1250
- return 1;
1181
+ STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int stride_bytes)
1182
+ {
1183
+ int len;
1184
+ unsigned char *png = stbi_write_png_to_mem((const unsigned char *) data, stride_bytes, x, y, comp, &len);
1185
+ if (png == NULL) return 0;
1186
+ func(context, png, len);
1187
+ STBIW_FREE(png);
1188
+ return 1;
1251
1189
  }
1252
1190
 
1191
+
1253
1192
  /* ***************************************************************************
1254
1193
  *
1255
1194
  * JPEG writer
1256
1195
  *
1257
1196
  * This is based on Jon Olick's jo_jpeg.cpp:
1258
- * public domain Simple, Minimalistic JPEG writer -
1259
- * http://www.jonolick.com/code.html
1197
+ * public domain Simple, Minimalistic JPEG writer - http://www.jonolick.com/code.html
1260
1198
  */
1261
1199
 
1262
- static const unsigned char stbiw__jpg_ZigZag[] = {
1263
- 0, 1, 5, 6, 14, 15, 27, 28, 2, 4, 7, 13, 16, 26, 29, 42,
1264
- 3, 8, 12, 17, 25, 30, 41, 43, 9, 11, 18, 24, 31, 40, 44, 53,
1265
- 10, 19, 23, 32, 39, 45, 52, 54, 20, 22, 33, 38, 46, 51, 55, 60,
1266
- 21, 34, 37, 47, 50, 56, 59, 61, 35, 36, 48, 49, 57, 58, 62, 63};
1267
-
1268
- static void stbiw__jpg_writeBits(stbi__write_context *s, int *bitBufP,
1269
- int *bitCntP, const unsigned short *bs) {
1270
- int bitBuf = *bitBufP, bitCnt = *bitCntP;
1271
- bitCnt += bs[1];
1272
- bitBuf |= bs[0] << (24 - bitCnt);
1273
- while (bitCnt >= 8) {
1274
- unsigned char c = (bitBuf >> 16) & 255;
1275
- stbiw__putc(s, c);
1276
- if (c == 255) {
1277
- stbiw__putc(s, 0);
1278
- }
1279
- bitBuf <<= 8;
1280
- bitCnt -= 8;
1281
- }
1282
- *bitBufP = bitBuf;
1283
- *bitCntP = bitCnt;
1200
+ static const unsigned char stbiw__jpg_ZigZag[] = { 0,1,5,6,14,15,27,28,2,4,7,13,16,26,29,42,3,8,12,17,25,30,41,43,9,11,18,
1201
+ 24,31,40,44,53,10,19,23,32,39,45,52,54,20,22,33,38,46,51,55,60,21,34,37,47,50,56,59,61,35,36,48,49,57,58,62,63 };
1202
+
1203
+ static void stbiw__jpg_writeBits(stbi__write_context *s, int *bitBufP, int *bitCntP, const unsigned short *bs) {
1204
+ int bitBuf = *bitBufP, bitCnt = *bitCntP;
1205
+ bitCnt += bs[1];
1206
+ bitBuf |= bs[0] << (24 - bitCnt);
1207
+ while(bitCnt >= 8) {
1208
+ unsigned char c = (bitBuf >> 16) & 255;
1209
+ stbiw__putc(s, c);
1210
+ if(c == 255) {
1211
+ stbiw__putc(s, 0);
1212
+ }
1213
+ bitBuf <<= 8;
1214
+ bitCnt -= 8;
1215
+ }
1216
+ *bitBufP = bitBuf;
1217
+ *bitCntP = bitCnt;
1284
1218
  }
1285
1219
 
1286
- static void stbiw__jpg_DCT(float *d0p, float *d1p, float *d2p, float *d3p,
1287
- float *d4p, float *d5p, float *d6p, float *d7p) {
1288
- float d0 = *d0p, d1 = *d1p, d2 = *d2p, d3 = *d3p, d4 = *d4p, d5 = *d5p,
1289
- d6 = *d6p, d7 = *d7p;
1290
- float z1, z2, z3, z4, z5, z11, z13;
1291
-
1292
- float tmp0 = d0 + d7;
1293
- float tmp7 = d0 - d7;
1294
- float tmp1 = d1 + d6;
1295
- float tmp6 = d1 - d6;
1296
- float tmp2 = d2 + d5;
1297
- float tmp5 = d2 - d5;
1298
- float tmp3 = d3 + d4;
1299
- float tmp4 = d3 - d4;
1300
-
1301
- // Even part
1302
- float tmp10 = tmp0 + tmp3; // phase 2
1303
- float tmp13 = tmp0 - tmp3;
1304
- float tmp11 = tmp1 + tmp2;
1305
- float tmp12 = tmp1 - tmp2;
1306
-
1307
- d0 = tmp10 + tmp11; // phase 3
1308
- d4 = tmp10 - tmp11;
1309
-
1310
- z1 = (tmp12 + tmp13) * 0.707106781f; // c4
1311
- d2 = tmp13 + z1; // phase 5
1312
- d6 = tmp13 - z1;
1313
-
1314
- // Odd part
1315
- tmp10 = tmp4 + tmp5; // phase 2
1316
- tmp11 = tmp5 + tmp6;
1317
- tmp12 = tmp6 + tmp7;
1318
-
1319
- // The rotator is modified from fig 4-8 to avoid extra negations.
1320
- z5 = (tmp10 - tmp12) * 0.382683433f; // c6
1321
- z2 = tmp10 * 0.541196100f + z5; // c2-c6
1322
- z4 = tmp12 * 1.306562965f + z5; // c2+c6
1323
- z3 = tmp11 * 0.707106781f; // c4
1324
-
1325
- z11 = tmp7 + z3; // phase 5
1326
- z13 = tmp7 - z3;
1327
-
1328
- *d5p = z13 + z2; // phase 6
1329
- *d3p = z13 - z2;
1330
- *d1p = z11 + z4;
1331
- *d7p = z11 - z4;
1332
-
1333
- *d0p = d0;
1334
- *d2p = d2;
1335
- *d4p = d4;
1336
- *d6p = d6;
1220
+ static void stbiw__jpg_DCT(float *d0p, float *d1p, float *d2p, float *d3p, float *d4p, float *d5p, float *d6p, float *d7p) {
1221
+ float d0 = *d0p, d1 = *d1p, d2 = *d2p, d3 = *d3p, d4 = *d4p, d5 = *d5p, d6 = *d6p, d7 = *d7p;
1222
+ float z1, z2, z3, z4, z5, z11, z13;
1223
+
1224
+ float tmp0 = d0 + d7;
1225
+ float tmp7 = d0 - d7;
1226
+ float tmp1 = d1 + d6;
1227
+ float tmp6 = d1 - d6;
1228
+ float tmp2 = d2 + d5;
1229
+ float tmp5 = d2 - d5;
1230
+ float tmp3 = d3 + d4;
1231
+ float tmp4 = d3 - d4;
1232
+
1233
+ // Even part
1234
+ float tmp10 = tmp0 + tmp3; // phase 2
1235
+ float tmp13 = tmp0 - tmp3;
1236
+ float tmp11 = tmp1 + tmp2;
1237
+ float tmp12 = tmp1 - tmp2;
1238
+
1239
+ d0 = tmp10 + tmp11; // phase 3
1240
+ d4 = tmp10 - tmp11;
1241
+
1242
+ z1 = (tmp12 + tmp13) * 0.707106781f; // c4
1243
+ d2 = tmp13 + z1; // phase 5
1244
+ d6 = tmp13 - z1;
1245
+
1246
+ // Odd part
1247
+ tmp10 = tmp4 + tmp5; // phase 2
1248
+ tmp11 = tmp5 + tmp6;
1249
+ tmp12 = tmp6 + tmp7;
1250
+
1251
+ // The rotator is modified from fig 4-8 to avoid extra negations.
1252
+ z5 = (tmp10 - tmp12) * 0.382683433f; // c6
1253
+ z2 = tmp10 * 0.541196100f + z5; // c2-c6
1254
+ z4 = tmp12 * 1.306562965f + z5; // c2+c6
1255
+ z3 = tmp11 * 0.707106781f; // c4
1256
+
1257
+ z11 = tmp7 + z3; // phase 5
1258
+ z13 = tmp7 - z3;
1259
+
1260
+ *d5p = z13 + z2; // phase 6
1261
+ *d3p = z13 - z2;
1262
+ *d1p = z11 + z4;
1263
+ *d7p = z11 - z4;
1264
+
1265
+ *d0p = d0; *d2p = d2; *d4p = d4; *d6p = d6;
1337
1266
  }
1338
1267
 
1339
1268
  static void stbiw__jpg_calcBits(int val, unsigned short bits[2]) {
1340
- int tmp1 = val < 0 ? -val : val;
1341
- val = val < 0 ? val - 1 : val;
1342
- bits[1] = 1;
1343
- while (tmp1 >>= 1) {
1344
- ++bits[1];
1345
- }
1346
- bits[0] = val & ((1 << bits[1]) - 1);
1269
+ int tmp1 = val < 0 ? -val : val;
1270
+ val = val < 0 ? val-1 : val;
1271
+ bits[1] = 1;
1272
+ while(tmp1 >>= 1) {
1273
+ ++bits[1];
1274
+ }
1275
+ bits[0] = val & ((1<<bits[1])-1);
1347
1276
  }
1348
1277
 
1349
- static int stbiw__jpg_processDU(stbi__write_context *s, int *bitBuf,
1350
- int *bitCnt, float *CDU, float *fdtbl, int DC,
1351
- const unsigned short HTDC[256][2],
1352
- const unsigned short HTAC[256][2]) {
1353
- const unsigned short EOB[2] = {HTAC[0x00][0], HTAC[0x00][1]};
1354
- const unsigned short M16zeroes[2] = {HTAC[0xF0][0], HTAC[0xF0][1]};
1355
- int dataOff, i, diff, end0pos;
1356
- int DU[64];
1357
-
1358
- // DCT rows
1359
- for (dataOff = 0; dataOff < 64; dataOff += 8) {
1360
- stbiw__jpg_DCT(&CDU[dataOff], &CDU[dataOff + 1], &CDU[dataOff + 2],
1361
- &CDU[dataOff + 3], &CDU[dataOff + 4], &CDU[dataOff + 5],
1362
- &CDU[dataOff + 6], &CDU[dataOff + 7]);
1363
- }
1364
- // DCT columns
1365
- for (dataOff = 0; dataOff < 8; ++dataOff) {
1366
- stbiw__jpg_DCT(&CDU[dataOff], &CDU[dataOff + 8], &CDU[dataOff + 16],
1367
- &CDU[dataOff + 24], &CDU[dataOff + 32], &CDU[dataOff + 40],
1368
- &CDU[dataOff + 48], &CDU[dataOff + 56]);
1369
- }
1370
- // Quantize/descale/zigzag the coefficients
1371
- for (i = 0; i < 64; ++i) {
1372
- float v = CDU[i] * fdtbl[i];
1373
- // DU[stbiw__jpg_ZigZag[i]] = (int)(v < 0 ? ceilf(v - 0.5f) : floorf(v +
1374
- // 0.5f)); ceilf() and floorf() are C99, not C89, but I /think/ they're not
1375
- // needed here anyway?
1376
- DU[stbiw__jpg_ZigZag[i]] = (int)(v < 0 ? v - 0.5f : v + 0.5f);
1377
- }
1378
-
1379
- // Encode DC
1380
- diff = DU[0] - DC;
1381
- if (diff == 0) {
1382
- stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTDC[0]);
1383
- } else {
1384
- unsigned short bits[2];
1385
- stbiw__jpg_calcBits(diff, bits);
1386
- stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTDC[bits[1]]);
1387
- stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits);
1388
- }
1389
- // Encode ACs
1390
- end0pos = 63;
1391
- for (; (end0pos > 0) && (DU[end0pos] == 0); --end0pos) {
1392
- }
1393
- // end0pos = first element in reverse order !=0
1394
- if (end0pos == 0) {
1395
- stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB);
1396
- return DU[0];
1397
- }
1398
- for (i = 1; i <= end0pos; ++i) {
1399
- int startpos = i;
1400
- int nrzeroes;
1401
- unsigned short bits[2];
1402
- for (; DU[i] == 0 && i <= end0pos; ++i) {
1403
- }
1404
- nrzeroes = i - startpos;
1405
- if (nrzeroes >= 16) {
1406
- int lng = nrzeroes >> 4;
1407
- int nrmarker;
1408
- for (nrmarker = 1; nrmarker <= lng; ++nrmarker)
1409
- stbiw__jpg_writeBits(s, bitBuf, bitCnt, M16zeroes);
1410
- nrzeroes &= 15;
1411
- }
1412
- stbiw__jpg_calcBits(DU[i], bits);
1413
- stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTAC[(nrzeroes << 4) + bits[1]]);
1414
- stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits);
1415
- }
1416
- if (end0pos != 63) {
1417
- stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB);
1418
- }
1419
- return DU[0];
1278
+ static int stbiw__jpg_processDU(stbi__write_context *s, int *bitBuf, int *bitCnt, float *CDU, float *fdtbl, int DC, const unsigned short HTDC[256][2], const unsigned short HTAC[256][2]) {
1279
+ const unsigned short EOB[2] = { HTAC[0x00][0], HTAC[0x00][1] };
1280
+ const unsigned short M16zeroes[2] = { HTAC[0xF0][0], HTAC[0xF0][1] };
1281
+ int dataOff, i, diff, end0pos;
1282
+ int DU[64];
1283
+
1284
+ // DCT rows
1285
+ for(dataOff=0; dataOff<64; dataOff+=8) {
1286
+ stbiw__jpg_DCT(&CDU[dataOff], &CDU[dataOff+1], &CDU[dataOff+2], &CDU[dataOff+3], &CDU[dataOff+4], &CDU[dataOff+5], &CDU[dataOff+6], &CDU[dataOff+7]);
1287
+ }
1288
+ // DCT columns
1289
+ for(dataOff=0; dataOff<8; ++dataOff) {
1290
+ stbiw__jpg_DCT(&CDU[dataOff], &CDU[dataOff+8], &CDU[dataOff+16], &CDU[dataOff+24], &CDU[dataOff+32], &CDU[dataOff+40], &CDU[dataOff+48], &CDU[dataOff+56]);
1291
+ }
1292
+ // Quantize/descale/zigzag the coefficients
1293
+ for(i=0; i<64; ++i) {
1294
+ float v = CDU[i]*fdtbl[i];
1295
+ // DU[stbiw__jpg_ZigZag[i]] = (int)(v < 0 ? ceilf(v - 0.5f) : floorf(v + 0.5f));
1296
+ // ceilf() and floorf() are C99, not C89, but I /think/ they're not needed here anyway?
1297
+ DU[stbiw__jpg_ZigZag[i]] = (int)(v < 0 ? v - 0.5f : v + 0.5f);
1298
+ }
1299
+
1300
+ // Encode DC
1301
+ diff = DU[0] - DC;
1302
+ if (diff == 0) {
1303
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTDC[0]);
1304
+ } else {
1305
+ unsigned short bits[2];
1306
+ stbiw__jpg_calcBits(diff, bits);
1307
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTDC[bits[1]]);
1308
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits);
1309
+ }
1310
+ // Encode ACs
1311
+ end0pos = 63;
1312
+ for(; (end0pos>0)&&(DU[end0pos]==0); --end0pos) {
1313
+ }
1314
+ // end0pos = first element in reverse order !=0
1315
+ if(end0pos == 0) {
1316
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB);
1317
+ return DU[0];
1318
+ }
1319
+ for(i = 1; i <= end0pos; ++i) {
1320
+ int startpos = i;
1321
+ int nrzeroes;
1322
+ unsigned short bits[2];
1323
+ for (; DU[i]==0 && i<=end0pos; ++i) {
1324
+ }
1325
+ nrzeroes = i-startpos;
1326
+ if ( nrzeroes >= 16 ) {
1327
+ int lng = nrzeroes>>4;
1328
+ int nrmarker;
1329
+ for (nrmarker=1; nrmarker <= lng; ++nrmarker)
1330
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, M16zeroes);
1331
+ nrzeroes &= 15;
1332
+ }
1333
+ stbiw__jpg_calcBits(DU[i], bits);
1334
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTAC[(nrzeroes<<4)+bits[1]]);
1335
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits);
1336
+ }
1337
+ if(end0pos != 63) {
1338
+ stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB);
1339
+ }
1340
+ return DU[0];
1420
1341
  }
1421
1342
 
1422
- static int stbi_write_jpg_core(stbi__write_context *s, int width, int height,
1423
- int comp, const void *data, int quality) {
1424
- // Constants that don't pollute global namespace
1425
- static const unsigned char std_dc_luminance_nrcodes[] = {
1426
- 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0};
1427
- static const unsigned char std_dc_luminance_values[] = {0, 1, 2, 3, 4, 5,
1428
- 6, 7, 8, 9, 10, 11};
1429
- static const unsigned char std_ac_luminance_nrcodes[] = {
1430
- 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d};
1431
- static const unsigned char std_ac_luminance_values[] = {
1432
- 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06,
1433
- 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
1434
- 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72,
1435
- 0x82, 0x09, 0x0a, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
1436
- 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45,
1437
- 0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
1438
- 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75,
1439
- 0x76, 0x77, 0x78, 0x79, 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
1440
- 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3,
1441
- 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
1442
- 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9,
1443
- 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
1444
- 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4,
1445
- 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa};
1446
- static const unsigned char std_dc_chrominance_nrcodes[] = {
1447
- 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0};
1448
- static const unsigned char std_dc_chrominance_values[] = {0, 1, 2, 3, 4, 5,
1449
- 6, 7, 8, 9, 10, 11};
1450
- static const unsigned char std_ac_chrominance_nrcodes[] = {
1451
- 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77};
1452
- static const unsigned char std_ac_chrominance_values[] = {
1453
- 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41,
1454
- 0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
1455
- 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, 0x15, 0x62, 0x72, 0xd1,
1456
- 0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
1457
- 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44,
1458
- 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
1459
- 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74,
1460
- 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
1461
- 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a,
1462
- 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
1463
- 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
1464
- 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
1465
- 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf2, 0xf3, 0xf4,
1466
- 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa};
1467
- // Huffman tables
1468
- static const unsigned short YDC_HT[256][2] = {
1469
- {0, 2}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3},
1470
- {14, 4}, {30, 5}, {62, 6}, {126, 7}, {254, 8}, {510, 9}};
1471
- static const unsigned short UVDC_HT[256][2] = {
1472
- {0, 2}, {1, 2}, {2, 2}, {6, 3}, {14, 4}, {30, 5},
1473
- {62, 6}, {126, 7}, {254, 8}, {510, 9}, {1022, 10}, {2046, 11}};
1474
- static const unsigned short YAC_HT[256][2] = {
1475
- {10, 4}, {0, 2}, {1, 2}, {4, 3}, {11, 4},
1476
- {26, 5}, {120, 7}, {248, 8}, {1014, 10}, {65410, 16},
1477
- {65411, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1478
- {0, 0}, {0, 0}, {12, 4}, {27, 5}, {121, 7},
1479
- {502, 9}, {2038, 11}, {65412, 16}, {65413, 16}, {65414, 16},
1480
- {65415, 16}, {65416, 16}, {0, 0}, {0, 0}, {0, 0},
1481
- {0, 0}, {0, 0}, {0, 0}, {28, 5}, {249, 8},
1482
- {1015, 10}, {4084, 12}, {65417, 16}, {65418, 16}, {65419, 16},
1483
- {65420, 16}, {65421, 16}, {65422, 16}, {0, 0}, {0, 0},
1484
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {58, 6},
1485
- {503, 9}, {4085, 12}, {65423, 16}, {65424, 16}, {65425, 16},
1486
- {65426, 16}, {65427, 16}, {65428, 16}, {65429, 16}, {0, 0},
1487
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1488
- {59, 6}, {1016, 10}, {65430, 16}, {65431, 16}, {65432, 16},
1489
- {65433, 16}, {65434, 16}, {65435, 16}, {65436, 16}, {65437, 16},
1490
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1491
- {0, 0}, {122, 7}, {2039, 11}, {65438, 16}, {65439, 16},
1492
- {65440, 16}, {65441, 16}, {65442, 16}, {65443, 16}, {65444, 16},
1493
- {65445, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1494
- {0, 0}, {0, 0}, {123, 7}, {4086, 12}, {65446, 16},
1495
- {65447, 16}, {65448, 16}, {65449, 16}, {65450, 16}, {65451, 16},
1496
- {65452, 16}, {65453, 16}, {0, 0}, {0, 0}, {0, 0},
1497
- {0, 0}, {0, 0}, {0, 0}, {250, 8}, {4087, 12},
1498
- {65454, 16}, {65455, 16}, {65456, 16}, {65457, 16}, {65458, 16},
1499
- {65459, 16}, {65460, 16}, {65461, 16}, {0, 0}, {0, 0},
1500
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {504, 9},
1501
- {32704, 15}, {65462, 16}, {65463, 16}, {65464, 16}, {65465, 16},
1502
- {65466, 16}, {65467, 16}, {65468, 16}, {65469, 16}, {0, 0},
1503
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1504
- {505, 9}, {65470, 16}, {65471, 16}, {65472, 16}, {65473, 16},
1505
- {65474, 16}, {65475, 16}, {65476, 16}, {65477, 16}, {65478, 16},
1506
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1507
- {0, 0}, {506, 9}, {65479, 16}, {65480, 16}, {65481, 16},
1508
- {65482, 16}, {65483, 16}, {65484, 16}, {65485, 16}, {65486, 16},
1509
- {65487, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1510
- {0, 0}, {0, 0}, {1017, 10}, {65488, 16}, {65489, 16},
1511
- {65490, 16}, {65491, 16}, {65492, 16}, {65493, 16}, {65494, 16},
1512
- {65495, 16}, {65496, 16}, {0, 0}, {0, 0}, {0, 0},
1513
- {0, 0}, {0, 0}, {0, 0}, {1018, 10}, {65497, 16},
1514
- {65498, 16}, {65499, 16}, {65500, 16}, {65501, 16}, {65502, 16},
1515
- {65503, 16}, {65504, 16}, {65505, 16}, {0, 0}, {0, 0},
1516
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {2040, 11},
1517
- {65506, 16}, {65507, 16}, {65508, 16}, {65509, 16}, {65510, 16},
1518
- {65511, 16}, {65512, 16}, {65513, 16}, {65514, 16}, {0, 0},
1519
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1520
- {65515, 16}, {65516, 16}, {65517, 16}, {65518, 16}, {65519, 16},
1521
- {65520, 16}, {65521, 16}, {65522, 16}, {65523, 16}, {65524, 16},
1522
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1523
- {2041, 11}, {65525, 16}, {65526, 16}, {65527, 16}, {65528, 16},
1524
- {65529, 16}, {65530, 16}, {65531, 16}, {65532, 16}, {65533, 16},
1525
- {65534, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1526
- {0, 0}};
1527
- static const unsigned short UVAC_HT[256][2] = {
1528
- {0, 2}, {1, 2}, {4, 3}, {10, 4}, {24, 5},
1529
- {25, 5}, {56, 6}, {120, 7}, {500, 9}, {1014, 10},
1530
- {4084, 12}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1531
- {0, 0}, {0, 0}, {11, 4}, {57, 6}, {246, 8},
1532
- {501, 9}, {2038, 11}, {4085, 12}, {65416, 16}, {65417, 16},
1533
- {65418, 16}, {65419, 16}, {0, 0}, {0, 0}, {0, 0},
1534
- {0, 0}, {0, 0}, {0, 0}, {26, 5}, {247, 8},
1535
- {1015, 10}, {4086, 12}, {32706, 15}, {65420, 16}, {65421, 16},
1536
- {65422, 16}, {65423, 16}, {65424, 16}, {0, 0}, {0, 0},
1537
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {27, 5},
1538
- {248, 8}, {1016, 10}, {4087, 12}, {65425, 16}, {65426, 16},
1539
- {65427, 16}, {65428, 16}, {65429, 16}, {65430, 16}, {0, 0},
1540
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1541
- {58, 6}, {502, 9}, {65431, 16}, {65432, 16}, {65433, 16},
1542
- {65434, 16}, {65435, 16}, {65436, 16}, {65437, 16}, {65438, 16},
1543
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1544
- {0, 0}, {59, 6}, {1017, 10}, {65439, 16}, {65440, 16},
1545
- {65441, 16}, {65442, 16}, {65443, 16}, {65444, 16}, {65445, 16},
1546
- {65446, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1547
- {0, 0}, {0, 0}, {121, 7}, {2039, 11}, {65447, 16},
1548
- {65448, 16}, {65449, 16}, {65450, 16}, {65451, 16}, {65452, 16},
1549
- {65453, 16}, {65454, 16}, {0, 0}, {0, 0}, {0, 0},
1550
- {0, 0}, {0, 0}, {0, 0}, {122, 7}, {2040, 11},
1551
- {65455, 16}, {65456, 16}, {65457, 16}, {65458, 16}, {65459, 16},
1552
- {65460, 16}, {65461, 16}, {65462, 16}, {0, 0}, {0, 0},
1553
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {249, 8},
1554
- {65463, 16}, {65464, 16}, {65465, 16}, {65466, 16}, {65467, 16},
1555
- {65468, 16}, {65469, 16}, {65470, 16}, {65471, 16}, {0, 0},
1556
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1557
- {503, 9}, {65472, 16}, {65473, 16}, {65474, 16}, {65475, 16},
1558
- {65476, 16}, {65477, 16}, {65478, 16}, {65479, 16}, {65480, 16},
1559
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1560
- {0, 0}, {504, 9}, {65481, 16}, {65482, 16}, {65483, 16},
1561
- {65484, 16}, {65485, 16}, {65486, 16}, {65487, 16}, {65488, 16},
1562
- {65489, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1563
- {0, 0}, {0, 0}, {505, 9}, {65490, 16}, {65491, 16},
1564
- {65492, 16}, {65493, 16}, {65494, 16}, {65495, 16}, {65496, 16},
1565
- {65497, 16}, {65498, 16}, {0, 0}, {0, 0}, {0, 0},
1566
- {0, 0}, {0, 0}, {0, 0}, {506, 9}, {65499, 16},
1567
- {65500, 16}, {65501, 16}, {65502, 16}, {65503, 16}, {65504, 16},
1568
- {65505, 16}, {65506, 16}, {65507, 16}, {0, 0}, {0, 0},
1569
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {2041, 11},
1570
- {65508, 16}, {65509, 16}, {65510, 16}, {65511, 16}, {65512, 16},
1571
- {65513, 16}, {65514, 16}, {65515, 16}, {65516, 16}, {0, 0},
1572
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1573
- {16352, 14}, {65517, 16}, {65518, 16}, {65519, 16}, {65520, 16},
1574
- {65521, 16}, {65522, 16}, {65523, 16}, {65524, 16}, {65525, 16},
1575
- {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1576
- {1018, 10}, {32707, 15}, {65526, 16}, {65527, 16}, {65528, 16},
1577
- {65529, 16}, {65530, 16}, {65531, 16}, {65532, 16}, {65533, 16},
1578
- {65534, 16}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
1579
- {0, 0}};
1580
- static const int YQT[] = {
1581
- 16, 11, 10, 16, 24, 40, 51, 61, 12, 12, 14, 19, 26, 58, 60, 55,
1582
- 14, 13, 16, 24, 40, 57, 69, 56, 14, 17, 22, 29, 51, 87, 80, 62,
1583
- 18, 22, 37, 56, 68, 109, 103, 77, 24, 35, 55, 64, 81, 104, 113, 92,
1584
- 49, 64, 78, 87, 103, 121, 120, 101, 72, 92, 95, 98, 112, 100, 103, 99};
1585
- static const int UVQT[] = {17, 18, 24, 47, 99, 99, 99, 99, 18, 21, 26, 66, 99,
1586
- 99, 99, 99, 24, 26, 56, 99, 99, 99, 99, 99, 47, 66,
1587
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
1588
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
1589
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99};
1590
- static const float aasf[] = {
1591
- 1.0f * 2.828427125f, 1.387039845f * 2.828427125f,
1592
- 1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f,
1593
- 1.0f * 2.828427125f, 0.785694958f * 2.828427125f,
1594
- 0.541196100f * 2.828427125f, 0.275899379f * 2.828427125f};
1595
-
1596
- int row, col, i, k;
1597
- float fdtbl_Y[64], fdtbl_UV[64];
1598
- unsigned char YTable[64], UVTable[64];
1599
-
1600
- if (!data || !width || !height || comp > 4 || comp < 1) {
1601
- return 0;
1602
- }
1603
-
1604
- quality = quality ? quality : 90;
1605
- quality = quality < 1 ? 1 : quality > 100 ? 100 : quality;
1606
- quality = quality < 50 ? 5000 / quality : 200 - quality * 2;
1607
-
1608
- for (i = 0; i < 64; ++i) {
1609
- int uvti, yti = (YQT[i] * quality + 50) / 100;
1610
- YTable[stbiw__jpg_ZigZag[i]] =
1611
- (unsigned char)(yti < 1 ? 1 : yti > 255 ? 255 : yti);
1612
- uvti = (UVQT[i] * quality + 50) / 100;
1613
- UVTable[stbiw__jpg_ZigZag[i]] =
1614
- (unsigned char)(uvti < 1 ? 1 : uvti > 255 ? 255 : uvti);
1615
- }
1616
-
1617
- for (row = 0, k = 0; row < 8; ++row) {
1618
- for (col = 0; col < 8; ++col, ++k) {
1619
- fdtbl_Y[k] = 1 / (YTable[stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]);
1620
- fdtbl_UV[k] = 1 / (UVTable[stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]);
1621
- }
1622
- }
1623
-
1624
- // Write Headers
1625
- {
1626
- static const unsigned char head0[] = {
1627
- 0xFF, 0xD8, 0xFF, 0xE0, 0, 0x10, 'J', 'F', 'I', 'F', 0, 1, 1,
1628
- 0, 0, 1, 0, 1, 0, 0, 0xFF, 0xDB, 0, 0x84, 0};
1629
- static const unsigned char head2[] = {0xFF, 0xDA, 0, 0xC, 3, 1, 0,
1630
- 2, 0x11, 3, 0x11, 0, 0x3F, 0};
1631
- const unsigned char head1[] = {0xFF,
1632
- 0xC0,
1633
- 0,
1634
- 0x11,
1635
- 8,
1636
- (unsigned char)(height >> 8),
1637
- STBIW_UCHAR(height),
1638
- (unsigned char)(width >> 8),
1639
- STBIW_UCHAR(width),
1640
- 3,
1641
- 1,
1642
- 0x11,
1643
- 0,
1644
- 2,
1645
- 0x11,
1646
- 1,
1647
- 3,
1648
- 0x11,
1649
- 1,
1650
- 0xFF,
1651
- 0xC4,
1652
- 0x01,
1653
- 0xA2,
1654
- 0};
1655
- s->func(s->context, (void *)head0, sizeof(head0));
1656
- s->func(s->context, (void *)YTable, sizeof(YTable));
1657
- stbiw__putc(s, 1);
1658
- s->func(s->context, UVTable, sizeof(UVTable));
1659
- s->func(s->context, (void *)head1, sizeof(head1));
1660
- s->func(s->context, (void *)(std_dc_luminance_nrcodes + 1),
1661
- sizeof(std_dc_luminance_nrcodes) - 1);
1662
- s->func(s->context, (void *)std_dc_luminance_values,
1663
- sizeof(std_dc_luminance_values));
1664
- stbiw__putc(s, 0x10); // HTYACinfo
1665
- s->func(s->context, (void *)(std_ac_luminance_nrcodes + 1),
1666
- sizeof(std_ac_luminance_nrcodes) - 1);
1667
- s->func(s->context, (void *)std_ac_luminance_values,
1668
- sizeof(std_ac_luminance_values));
1669
- stbiw__putc(s, 1); // HTUDCinfo
1670
- s->func(s->context, (void *)(std_dc_chrominance_nrcodes + 1),
1671
- sizeof(std_dc_chrominance_nrcodes) - 1);
1672
- s->func(s->context, (void *)std_dc_chrominance_values,
1673
- sizeof(std_dc_chrominance_values));
1674
- stbiw__putc(s, 0x11); // HTUACinfo
1675
- s->func(s->context, (void *)(std_ac_chrominance_nrcodes + 1),
1676
- sizeof(std_ac_chrominance_nrcodes) - 1);
1677
- s->func(s->context, (void *)std_ac_chrominance_values,
1678
- sizeof(std_ac_chrominance_values));
1679
- s->func(s->context, (void *)head2, sizeof(head2));
1680
- }
1681
-
1682
- // Encode 8x8 macroblocks
1683
- {
1684
- static const unsigned short fillBits[] = {0x7F, 7};
1685
- const unsigned char *imageData = (const unsigned char *)data;
1686
- int DCY = 0, DCU = 0, DCV = 0;
1687
- int bitBuf = 0, bitCnt = 0;
1688
- // comp == 2 is grey+alpha (alpha is ignored)
1689
- int ofsG = comp > 2 ? 1 : 0, ofsB = comp > 2 ? 2 : 0;
1690
- int x, y, pos;
1691
- for (y = 0; y < height; y += 8) {
1692
- for (x = 0; x < width; x += 8) {
1693
- float YDU[64], UDU[64], VDU[64];
1694
- for (row = y, pos = 0; row < y + 8; ++row) {
1695
- for (col = x; col < x + 8; ++col, ++pos) {
1696
- int p = (stbi__flip_vertically_on_write ? height - 1 - row : row) *
1697
- width * comp +
1698
- col * comp;
1699
- float r, g, b;
1700
- if (row >= height) {
1701
- p -= width * comp * (row + 1 - height);
1702
- }
1703
- if (col >= width) {
1704
- p -= comp * (col + 1 - width);
1343
+ static int stbi_write_jpg_core(stbi__write_context *s, int width, int height, int comp, const void* data, int quality) {
1344
+ // Constants that don't pollute global namespace
1345
+ static const unsigned char std_dc_luminance_nrcodes[] = {0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0};
1346
+ static const unsigned char std_dc_luminance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11};
1347
+ static const unsigned char std_ac_luminance_nrcodes[] = {0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d};
1348
+ static const unsigned char std_ac_luminance_values[] = {
1349
+ 0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08,
1350
+ 0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0,0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28,
1351
+ 0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,
1352
+ 0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89,
1353
+ 0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,
1354
+ 0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2,
1355
+ 0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa
1356
+ };
1357
+ static const unsigned char std_dc_chrominance_nrcodes[] = {0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0};
1358
+ static const unsigned char std_dc_chrominance_values[] = {0,1,2,3,4,5,6,7,8,9,10,11};
1359
+ static const unsigned char std_ac_chrominance_nrcodes[] = {0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77};
1360
+ static const unsigned char std_ac_chrominance_values[] = {
1361
+ 0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91,
1362
+ 0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0,0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26,
1363
+ 0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,
1364
+ 0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87,
1365
+ 0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,
1366
+ 0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,
1367
+ 0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa
1368
+ };
1369
+ // Huffman tables
1370
+ static const unsigned short YDC_HT[256][2] = { {0,2},{2,3},{3,3},{4,3},{5,3},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9}};
1371
+ static const unsigned short UVDC_HT[256][2] = { {0,2},{1,2},{2,2},{6,3},{14,4},{30,5},{62,6},{126,7},{254,8},{510,9},{1022,10},{2046,11}};
1372
+ static const unsigned short YAC_HT[256][2] = {
1373
+ {10,4},{0,2},{1,2},{4,3},{11,4},{26,5},{120,7},{248,8},{1014,10},{65410,16},{65411,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1374
+ {12,4},{27,5},{121,7},{502,9},{2038,11},{65412,16},{65413,16},{65414,16},{65415,16},{65416,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1375
+ {28,5},{249,8},{1015,10},{4084,12},{65417,16},{65418,16},{65419,16},{65420,16},{65421,16},{65422,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1376
+ {58,6},{503,9},{4085,12},{65423,16},{65424,16},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1377
+ {59,6},{1016,10},{65430,16},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1378
+ {122,7},{2039,11},{65438,16},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1379
+ {123,7},{4086,12},{65446,16},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1380
+ {250,8},{4087,12},{65454,16},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1381
+ {504,9},{32704,15},{65462,16},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1382
+ {505,9},{65470,16},{65471,16},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1383
+ {506,9},{65479,16},{65480,16},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1384
+ {1017,10},{65488,16},{65489,16},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1385
+ {1018,10},{65497,16},{65498,16},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1386
+ {2040,11},{65506,16},{65507,16},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1387
+ {65515,16},{65516,16},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{0,0},{0,0},{0,0},{0,0},{0,0},
1388
+ {2041,11},{65525,16},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0}
1389
+ };
1390
+ static const unsigned short UVAC_HT[256][2] = {
1391
+ {0,2},{1,2},{4,3},{10,4},{24,5},{25,5},{56,6},{120,7},{500,9},{1014,10},{4084,12},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1392
+ {11,4},{57,6},{246,8},{501,9},{2038,11},{4085,12},{65416,16},{65417,16},{65418,16},{65419,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1393
+ {26,5},{247,8},{1015,10},{4086,12},{32706,15},{65420,16},{65421,16},{65422,16},{65423,16},{65424,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1394
+ {27,5},{248,8},{1016,10},{4087,12},{65425,16},{65426,16},{65427,16},{65428,16},{65429,16},{65430,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1395
+ {58,6},{502,9},{65431,16},{65432,16},{65433,16},{65434,16},{65435,16},{65436,16},{65437,16},{65438,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1396
+ {59,6},{1017,10},{65439,16},{65440,16},{65441,16},{65442,16},{65443,16},{65444,16},{65445,16},{65446,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1397
+ {121,7},{2039,11},{65447,16},{65448,16},{65449,16},{65450,16},{65451,16},{65452,16},{65453,16},{65454,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1398
+ {122,7},{2040,11},{65455,16},{65456,16},{65457,16},{65458,16},{65459,16},{65460,16},{65461,16},{65462,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1399
+ {249,8},{65463,16},{65464,16},{65465,16},{65466,16},{65467,16},{65468,16},{65469,16},{65470,16},{65471,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1400
+ {503,9},{65472,16},{65473,16},{65474,16},{65475,16},{65476,16},{65477,16},{65478,16},{65479,16},{65480,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1401
+ {504,9},{65481,16},{65482,16},{65483,16},{65484,16},{65485,16},{65486,16},{65487,16},{65488,16},{65489,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1402
+ {505,9},{65490,16},{65491,16},{65492,16},{65493,16},{65494,16},{65495,16},{65496,16},{65497,16},{65498,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1403
+ {506,9},{65499,16},{65500,16},{65501,16},{65502,16},{65503,16},{65504,16},{65505,16},{65506,16},{65507,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1404
+ {2041,11},{65508,16},{65509,16},{65510,16},{65511,16},{65512,16},{65513,16},{65514,16},{65515,16},{65516,16},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},
1405
+ {16352,14},{65517,16},{65518,16},{65519,16},{65520,16},{65521,16},{65522,16},{65523,16},{65524,16},{65525,16},{0,0},{0,0},{0,0},{0,0},{0,0},
1406
+ {1018,10},{32707,15},{65526,16},{65527,16},{65528,16},{65529,16},{65530,16},{65531,16},{65532,16},{65533,16},{65534,16},{0,0},{0,0},{0,0},{0,0},{0,0}
1407
+ };
1408
+ static const int YQT[] = {16,11,10,16,24,40,51,61,12,12,14,19,26,58,60,55,14,13,16,24,40,57,69,56,14,17,22,29,51,87,80,62,18,22,
1409
+ 37,56,68,109,103,77,24,35,55,64,81,104,113,92,49,64,78,87,103,121,120,101,72,92,95,98,112,100,103,99};
1410
+ static const int UVQT[] = {17,18,24,47,99,99,99,99,18,21,26,66,99,99,99,99,24,26,56,99,99,99,99,99,47,66,99,99,99,99,99,99,
1411
+ 99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99};
1412
+ static const float aasf[] = { 1.0f * 2.828427125f, 1.387039845f * 2.828427125f, 1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f,
1413
+ 1.0f * 2.828427125f, 0.785694958f * 2.828427125f, 0.541196100f * 2.828427125f, 0.275899379f * 2.828427125f };
1414
+
1415
+ int row, col, i, k;
1416
+ float fdtbl_Y[64], fdtbl_UV[64];
1417
+ unsigned char YTable[64], UVTable[64];
1418
+
1419
+ if(!data || !width || !height || comp > 4 || comp < 1) {
1420
+ return 0;
1421
+ }
1422
+
1423
+ quality = quality ? quality : 90;
1424
+ quality = quality < 1 ? 1 : quality > 100 ? 100 : quality;
1425
+ quality = quality < 50 ? 5000 / quality : 200 - quality * 2;
1426
+
1427
+ for(i = 0; i < 64; ++i) {
1428
+ int uvti, yti = (YQT[i]*quality+50)/100;
1429
+ YTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (yti < 1 ? 1 : yti > 255 ? 255 : yti);
1430
+ uvti = (UVQT[i]*quality+50)/100;
1431
+ UVTable[stbiw__jpg_ZigZag[i]] = (unsigned char) (uvti < 1 ? 1 : uvti > 255 ? 255 : uvti);
1432
+ }
1433
+
1434
+ for(row = 0, k = 0; row < 8; ++row) {
1435
+ for(col = 0; col < 8; ++col, ++k) {
1436
+ fdtbl_Y[k] = 1 / (YTable [stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]);
1437
+ fdtbl_UV[k] = 1 / (UVTable[stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]);
1438
+ }
1439
+ }
1440
+
1441
+ // Write Headers
1442
+ {
1443
+ static const unsigned char head0[] = { 0xFF,0xD8,0xFF,0xE0,0,0x10,'J','F','I','F',0,1,1,0,0,1,0,1,0,0,0xFF,0xDB,0,0x84,0 };
1444
+ static const unsigned char head2[] = { 0xFF,0xDA,0,0xC,3,1,0,2,0x11,3,0x11,0,0x3F,0 };
1445
+ const unsigned char head1[] = { 0xFF,0xC0,0,0x11,8,(unsigned char)(height>>8),STBIW_UCHAR(height),(unsigned char)(width>>8),STBIW_UCHAR(width),
1446
+ 3,1,0x11,0,2,0x11,1,3,0x11,1,0xFF,0xC4,0x01,0xA2,0 };
1447
+ s->func(s->context, (void*)head0, sizeof(head0));
1448
+ s->func(s->context, (void*)YTable, sizeof(YTable));
1449
+ stbiw__putc(s, 1);
1450
+ s->func(s->context, UVTable, sizeof(UVTable));
1451
+ s->func(s->context, (void*)head1, sizeof(head1));
1452
+ s->func(s->context, (void*)(std_dc_luminance_nrcodes+1), sizeof(std_dc_luminance_nrcodes)-1);
1453
+ s->func(s->context, (void*)std_dc_luminance_values, sizeof(std_dc_luminance_values));
1454
+ stbiw__putc(s, 0x10); // HTYACinfo
1455
+ s->func(s->context, (void*)(std_ac_luminance_nrcodes+1), sizeof(std_ac_luminance_nrcodes)-1);
1456
+ s->func(s->context, (void*)std_ac_luminance_values, sizeof(std_ac_luminance_values));
1457
+ stbiw__putc(s, 1); // HTUDCinfo
1458
+ s->func(s->context, (void*)(std_dc_chrominance_nrcodes+1), sizeof(std_dc_chrominance_nrcodes)-1);
1459
+ s->func(s->context, (void*)std_dc_chrominance_values, sizeof(std_dc_chrominance_values));
1460
+ stbiw__putc(s, 0x11); // HTUACinfo
1461
+ s->func(s->context, (void*)(std_ac_chrominance_nrcodes+1), sizeof(std_ac_chrominance_nrcodes)-1);
1462
+ s->func(s->context, (void*)std_ac_chrominance_values, sizeof(std_ac_chrominance_values));
1463
+ s->func(s->context, (void*)head2, sizeof(head2));
1464
+ }
1465
+
1466
+ // Encode 8x8 macroblocks
1467
+ {
1468
+ static const unsigned short fillBits[] = {0x7F, 7};
1469
+ const unsigned char *imageData = (const unsigned char *)data;
1470
+ int DCY=0, DCU=0, DCV=0;
1471
+ int bitBuf=0, bitCnt=0;
1472
+ // comp == 2 is grey+alpha (alpha is ignored)
1473
+ int ofsG = comp > 2 ? 1 : 0, ofsB = comp > 2 ? 2 : 0;
1474
+ int x, y, pos;
1475
+ for(y = 0; y < height; y += 8) {
1476
+ for(x = 0; x < width; x += 8) {
1477
+ float YDU[64], UDU[64], VDU[64];
1478
+ for(row = y, pos = 0; row < y+8; ++row) {
1479
+ // row >= height => use last input row
1480
+ int clamped_row = (row < height) ? row : height - 1;
1481
+ int base_p = (stbi__flip_vertically_on_write ? (height-1-clamped_row) : clamped_row)*width*comp;
1482
+ for(col = x; col < x+8; ++col, ++pos) {
1483
+ float r, g, b;
1484
+ // if col >= width => use pixel from last input column
1485
+ int p = base_p + ((col < width) ? col : (width-1))*comp;
1486
+
1487
+ r = imageData[p+0];
1488
+ g = imageData[p+ofsG];
1489
+ b = imageData[p+ofsB];
1490
+ YDU[pos]=+0.29900f*r+0.58700f*g+0.11400f*b-128;
1491
+ UDU[pos]=-0.16874f*r-0.33126f*g+0.50000f*b;
1492
+ VDU[pos]=+0.50000f*r-0.41869f*g-0.08131f*b;
1493
+ }
1705
1494
  }
1706
1495
 
1707
- r = imageData[p + 0];
1708
- g = imageData[p + ofsG];
1709
- b = imageData[p + ofsB];
1710
- YDU[pos] = +0.29900f * r + 0.58700f * g + 0.11400f * b - 128;
1711
- UDU[pos] = -0.16874f * r - 0.33126f * g + 0.50000f * b;
1712
- VDU[pos] = +0.50000f * r - 0.41869f * g - 0.08131f * b;
1713
- }
1714
- }
1715
-
1716
- DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, YDU, fdtbl_Y, DCY,
1717
- YDC_HT, YAC_HT);
1718
- DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, UDU, fdtbl_UV, DCU,
1719
- UVDC_HT, UVAC_HT);
1720
- DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, VDU, fdtbl_UV, DCV,
1721
- UVDC_HT, UVAC_HT);
1496
+ DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, YDU, fdtbl_Y, DCY, YDC_HT, YAC_HT);
1497
+ DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, UDU, fdtbl_UV, DCU, UVDC_HT, UVAC_HT);
1498
+ DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, VDU, fdtbl_UV, DCV, UVDC_HT, UVAC_HT);
1499
+ }
1722
1500
  }
1723
- }
1724
1501
 
1725
- // Do the bit alignment of the EOI marker
1726
- stbiw__jpg_writeBits(s, &bitBuf, &bitCnt, fillBits);
1727
- }
1502
+ // Do the bit alignment of the EOI marker
1503
+ stbiw__jpg_writeBits(s, &bitBuf, &bitCnt, fillBits);
1504
+ }
1728
1505
 
1729
- // EOI
1730
- stbiw__putc(s, 0xFF);
1731
- stbiw__putc(s, 0xD9);
1506
+ // EOI
1507
+ stbiw__putc(s, 0xFF);
1508
+ stbiw__putc(s, 0xD9);
1732
1509
 
1733
- return 1;
1510
+ return 1;
1734
1511
  }
1735
1512
 
1736
- STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x,
1737
- int y, int comp, const void *data,
1738
- int quality) {
1739
- stbi__write_context s;
1740
- stbi__start_write_callbacks(&s, func, context);
1741
- return stbi_write_jpg_core(&s, x, y, comp, (void *)data, quality);
1513
+ STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x, int y, int comp, const void *data, int quality)
1514
+ {
1515
+ stbi__write_context s;
1516
+ stbi__start_write_callbacks(&s, func, context);
1517
+ return stbi_write_jpg_core(&s, x, y, comp, (void *) data, quality);
1742
1518
  }
1743
1519
 
1520
+
1744
1521
  #ifndef STBI_WRITE_NO_STDIO
1745
- STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp,
1746
- const void *data, int quality) {
1747
- stbi__write_context s;
1748
- if (stbi__start_write_file(&s, filename)) {
1749
- int r = stbi_write_jpg_core(&s, x, y, comp, data, quality);
1750
- stbi__end_write_file(&s);
1751
- return r;
1752
- } else
1753
- return 0;
1522
+ STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const void *data, int quality)
1523
+ {
1524
+ stbi__write_context s;
1525
+ if (stbi__start_write_file(&s,filename)) {
1526
+ int r = stbi_write_jpg_core(&s, x, y, comp, data, quality);
1527
+ stbi__end_write_file(&s);
1528
+ return r;
1529
+ } else
1530
+ return 0;
1754
1531
  }
1755
1532
  #endif
1756
1533
 
1757
- #endif // STB_IMAGE_WRITE_IMPLEMENTATION
1534
+ #endif // STB_IMAGE_WRITE_IMPLEMENTATION
1758
1535
 
1759
1536
  /* Revision history
1537
+ 1.10 (2019-02-07)
1538
+ support utf8 filenames in Windows; fix warnings and platform ifdefs
1760
1539
  1.09 (2018-02-11)
1761
1540
  fix typo in zlib quality API, improve STB_I_W_STATIC in C++
1762
1541
  1.08 (2018-01-29)
1763
- add stbi__flip_vertically_on_write, external zlib, zlib quality,
1764
- choose PNG filter 1.07 (2017-07-24) doc fix 1.06 (2017-07-23) writing JPEG
1765
- (using Jon Olick's code) 1.05 ??? 1.04 (2017-03-03) monochrome BMP
1766
- expansion 1.03 ??? 1.02 (2016-04-02) avoid allocating large structures on
1767
- the stack 1.01 (2016-01-16) STBIW_REALLOC_SIZED: support allocators with no
1768
- realloc support avoid race-condition in crc initialization minor compile
1769
- issues 1.00 (2015-09-14) installable file IO function 0.99 (2015-09-13)
1542
+ add stbi__flip_vertically_on_write, external zlib, zlib quality, choose PNG filter
1543
+ 1.07 (2017-07-24)
1544
+ doc fix
1545
+ 1.06 (2017-07-23)
1546
+ writing JPEG (using Jon Olick's code)
1547
+ 1.05 ???
1548
+ 1.04 (2017-03-03)
1549
+ monochrome BMP expansion
1550
+ 1.03 ???
1551
+ 1.02 (2016-04-02)
1552
+ avoid allocating large structures on the stack
1553
+ 1.01 (2016-01-16)
1554
+ STBIW_REALLOC_SIZED: support allocators with no realloc support
1555
+ avoid race-condition in crc initialization
1556
+ minor compile issues
1557
+ 1.00 (2015-09-14)
1558
+ installable file IO function
1559
+ 0.99 (2015-09-13)
1770
1560
  warning fixes; TGA rle support
1771
1561
  0.98 (2015-04-08)
1772
1562
  added STBIW_MALLOC, STBIW_ASSERT etc
@@ -1794,38 +1584,38 @@ This software is available under 2 licenses -- choose whichever you prefer.
1794
1584
  ------------------------------------------------------------------------------
1795
1585
  ALTERNATIVE A - MIT License
1796
1586
  Copyright (c) 2017 Sean Barrett
1797
- Permission is hereby granted, free of charge, to any person obtaining a copy of
1798
- this software and associated documentation files (the "Software"), to deal in
1799
- the Software without restriction, including without limitation the rights to
1800
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
1801
- of the Software, and to permit persons to whom the Software is furnished to do
1587
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
1588
+ this software and associated documentation files (the "Software"), to deal in
1589
+ the Software without restriction, including without limitation the rights to
1590
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
1591
+ of the Software, and to permit persons to whom the Software is furnished to do
1802
1592
  so, subject to the following conditions:
1803
- The above copyright notice and this permission notice shall be included in all
1593
+ The above copyright notice and this permission notice shall be included in all
1804
1594
  copies or substantial portions of the Software.
1805
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1806
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1807
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1808
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1809
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1810
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1595
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1596
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1597
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1598
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1599
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1600
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1811
1601
  SOFTWARE.
1812
1602
  ------------------------------------------------------------------------------
1813
1603
  ALTERNATIVE B - Public Domain (www.unlicense.org)
1814
1604
  This is free and unencumbered software released into the public domain.
1815
- Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
1816
- software, either in source code form or as a compiled binary, for any purpose,
1605
+ Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
1606
+ software, either in source code form or as a compiled binary, for any purpose,
1817
1607
  commercial or non-commercial, and by any means.
1818
- In jurisdictions that recognize copyright laws, the author or authors of this
1819
- software dedicate any and all copyright interest in the software to the public
1820
- domain. We make this dedication for the benefit of the public at large and to
1821
- the detriment of our heirs and successors. We intend this dedication to be an
1822
- overt act of relinquishment in perpetuity of all present and future rights to
1608
+ In jurisdictions that recognize copyright laws, the author or authors of this
1609
+ software dedicate any and all copyright interest in the software to the public
1610
+ domain. We make this dedication for the benefit of the public at large and to
1611
+ the detriment of our heirs and successors. We intend this dedication to be an
1612
+ overt act of relinquishment in perpetuity of all present and future rights to
1823
1613
  this software under copyright law.
1824
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1825
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1826
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1827
- AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
1828
- ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1614
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1615
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1616
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1617
+ AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
1618
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1829
1619
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1830
1620
  ------------------------------------------------------------------------------
1831
1621
  */