bare-jpeg 1.1.1 → 1.1.3
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.
- package/binding.c +21 -10
- package/package.json +1 -1
- package/prebuilds/android-arm/bare-jpeg.bare +0 -0
- package/prebuilds/android-arm64/bare-jpeg.bare +0 -0
- package/prebuilds/android-ia32/bare-jpeg.bare +0 -0
- package/prebuilds/android-x64/bare-jpeg.bare +0 -0
- package/prebuilds/darwin-arm64/bare-jpeg.bare +0 -0
- package/prebuilds/darwin-x64/bare-jpeg.bare +0 -0
- package/prebuilds/ios-arm64/bare-jpeg.bare +0 -0
- package/prebuilds/ios-arm64-simulator/bare-jpeg.bare +0 -0
- package/prebuilds/ios-x64-simulator/bare-jpeg.bare +0 -0
- package/prebuilds/linux-arm64/bare-jpeg.bare +0 -0
- package/prebuilds/linux-x64/bare-jpeg.bare +0 -0
- package/prebuilds/win32-arm64/bare-jpeg.bare +0 -0
- package/prebuilds/win32-x64/bare-jpeg.bare +0 -0
package/binding.c
CHANGED
|
@@ -73,9 +73,9 @@ bare_jpeg_decode(js_env_t *env, js_callback_info_t *info) {
|
|
|
73
73
|
|
|
74
74
|
jpeg_start_decompress(&decoder);
|
|
75
75
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
76
|
+
JDIMENSION width = decoder.output_width;
|
|
77
|
+
JDIMENSION height = decoder.output_height;
|
|
78
|
+
JDIMENSION channels = decoder.output_components;
|
|
79
79
|
|
|
80
80
|
js_value_t *result;
|
|
81
81
|
err = js_create_object(env, &result);
|
|
@@ -94,7 +94,7 @@ bare_jpeg_decode(js_env_t *env, js_callback_info_t *info) {
|
|
|
94
94
|
V(height);
|
|
95
95
|
#undef V
|
|
96
96
|
|
|
97
|
-
len = width * height * 4;
|
|
97
|
+
len = (size_t) width * height * 4;
|
|
98
98
|
|
|
99
99
|
js_value_t *buffer;
|
|
100
100
|
|
|
@@ -107,15 +107,15 @@ bare_jpeg_decode(js_env_t *env, js_callback_info_t *info) {
|
|
|
107
107
|
|
|
108
108
|
JSAMPARRAY scanlines = (*decoder.mem->alloc_sarray)((j_common_ptr) &decoder, JPOOL_IMAGE, width * channels, 1);
|
|
109
109
|
|
|
110
|
-
|
|
110
|
+
JDIMENSION row = 0;
|
|
111
111
|
|
|
112
112
|
while (decoder.output_scanline < decoder.output_height) {
|
|
113
113
|
jpeg_read_scanlines(&decoder, scanlines, 1);
|
|
114
114
|
|
|
115
115
|
const uint8_t *src = scanlines[0];
|
|
116
|
-
uint8_t *dst = data + row * width * 4;
|
|
116
|
+
uint8_t *dst = data + (size_t) row * width * 4;
|
|
117
117
|
|
|
118
|
-
for (
|
|
118
|
+
for (JDIMENSION x = 0; x < width; x++) {
|
|
119
119
|
dst[x * 4 + 0] = src[x * channels + 0];
|
|
120
120
|
dst[x * 4 + 1] = src[x * channels + 1];
|
|
121
121
|
dst[x * 4 + 2] = src[x * channels + 2];
|
|
@@ -159,6 +159,13 @@ bare_jpeg_encode(js_env_t *env, js_callback_info_t *info) {
|
|
|
159
159
|
err = js_get_value_int64(env, argv[3], &quality);
|
|
160
160
|
assert(err == 0);
|
|
161
161
|
|
|
162
|
+
if (width < 0 || width > JPEG_MAX_DIMENSION || height < 0 || height > JPEG_MAX_DIMENSION) {
|
|
163
|
+
err = js_throw_error(env, NULL, "Invalid JPEG dimensions");
|
|
164
|
+
assert(err == 0);
|
|
165
|
+
|
|
166
|
+
return NULL;
|
|
167
|
+
}
|
|
168
|
+
|
|
162
169
|
bare_jpeg_error_t error;
|
|
163
170
|
|
|
164
171
|
struct jpeg_compress_struct encoder;
|
|
@@ -169,6 +176,7 @@ bare_jpeg_encode(js_env_t *env, js_callback_info_t *info) {
|
|
|
169
176
|
|
|
170
177
|
uint8_t *jpeg = NULL;
|
|
171
178
|
unsigned long len = 0;
|
|
179
|
+
uint8_t *dst = NULL;
|
|
172
180
|
jpeg_mem_dest(&encoder, &jpeg, &len);
|
|
173
181
|
|
|
174
182
|
encoder.image_width = width;
|
|
@@ -187,6 +195,9 @@ bare_jpeg_encode(js_env_t *env, js_callback_info_t *info) {
|
|
|
187
195
|
err = js_throw_error(env, NULL, error.message);
|
|
188
196
|
assert(err == 0);
|
|
189
197
|
|
|
198
|
+
free(jpeg);
|
|
199
|
+
free(dst);
|
|
200
|
+
|
|
190
201
|
jpeg_destroy_compress(&encoder);
|
|
191
202
|
|
|
192
203
|
return NULL;
|
|
@@ -194,12 +205,12 @@ bare_jpeg_encode(js_env_t *env, js_callback_info_t *info) {
|
|
|
194
205
|
|
|
195
206
|
jpeg_start_compress(&encoder, true);
|
|
196
207
|
|
|
197
|
-
|
|
208
|
+
dst = malloc((size_t) width * 3);
|
|
198
209
|
|
|
199
210
|
while (encoder.next_scanline < encoder.image_height) {
|
|
200
|
-
const uint8_t *src = data + encoder.next_scanline * width * 4;
|
|
211
|
+
const uint8_t *src = data + (size_t) encoder.next_scanline * width * 4;
|
|
201
212
|
|
|
202
|
-
for (
|
|
213
|
+
for (JDIMENSION x = 0; x < (JDIMENSION) width; x++) {
|
|
203
214
|
dst[x * 3 + 0] = src[x * 4 + 0];
|
|
204
215
|
dst[x * 3 + 1] = src[x * 4 + 1];
|
|
205
216
|
dst[x * 3 + 2] = src[x * 4 + 2];
|
package/package.json
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|