diff --git a/bmp.c b/bmp.c index fa4479da..4986055c 100644 --- a/bmp.c +++ b/bmp.c @@ -98,7 +98,7 @@ static void pixelconvert(unsigned char *srcbuf, int srcpf, int srcbottomup, } -int loadbmp(char *filename, unsigned char **buf, int *w, int *h, +int loadbmp(char *filename, unsigned char **buf, int *w, int *h, int dstpf, int bottomup) { int retval=0, dstps, srcpf, tempc; diff --git a/java/TJUnitTest.java b/java/TJUnitTest.java index d8b5c854..ab539c4f 100644 --- a/java/TJUnitTest.java +++ b/java/TJUnitTest.java @@ -324,7 +324,7 @@ public class TJUnitTest { index = row * w + col; byte c = buf[index * ps]; byte m = buf[index * ps + 1]; - byte y = buf[index * ps + 2]; + byte y = buf[index * ps + 2]; byte k = buf[index * ps + 3]; checkVal255(row, col, c, "C"); if (((row / blockSize) + (col / blockSize)) % 2 == 0) { @@ -673,7 +673,7 @@ public class TJUnitTest { tjc.setSubsamp(subsamp); tjc.setJPEGQuality(jpegQual); if (doYUV) { - System.out.format("%s %s -> YUV %s ... ", pfStrLong, buStrLong, + System.out.format("%s %s -> YUV %s ... ", pfStrLong, buStrLong, subNameLong[subsamp]); YUVImage yuvImage = tjc.encodeYUV(pad, flags); if (checkBufYUV(yuvImage.getBuf(), yuvImage.getSize(), w, h, subsamp, diff --git a/jsimd.h b/jsimd.h index 3fa2c432..ae072157 100644 --- a/jsimd.h +++ b/jsimd.h @@ -3,7 +3,7 @@ * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright 2011 D. R. Commander - * + * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. * For conditions of distribution and use, see copyright notice in jsimdext.inc diff --git a/jsimd_none.c b/jsimd_none.c index 882fc087..7b2e9651 100644 --- a/jsimd_none.c +++ b/jsimd_none.c @@ -3,7 +3,7 @@ * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright 2009-2011 D. R. Commander - * + * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. * For conditions of distribution and use, see copyright notice in jsimdext.inc @@ -95,7 +95,7 @@ jsimd_can_h2v1_upsample (void) GLOBAL(void) jsimd_h2v2_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -103,7 +103,7 @@ jsimd_h2v2_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -123,7 +123,7 @@ jsimd_can_h2v1_fancy_upsample (void) GLOBAL(void) jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -131,7 +131,7 @@ jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { diff --git a/jsimddct.h b/jsimddct.h index 9d2d9455..d962b9b1 100644 --- a/jsimddct.h +++ b/jsimddct.h @@ -2,7 +2,7 @@ * jsimddct.h * * Copyright 2009 Pierre Ossman for Cendio AB - * + * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. * For conditions of distribution and use, see copyright notice in jsimdext.inc diff --git a/simd/Makefile.am b/simd/Makefile.am index be2f0a5f..5e977c16 100644 --- a/simd/Makefile.am +++ b/simd/Makefile.am @@ -70,7 +70,7 @@ libsimd_la_SOURCES = jsimd_mips.c jsimd_mips_dspr2_asm.h jsimd_mips_dspr2.S endif -AM_CPPFLAGS = -I$(top_srcdir) +AM_CPPFLAGS = -I$(top_srcdir) .asm.lo: $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@ diff --git a/simd/jsimd_arm.c b/simd/jsimd_arm.c index c6fa4caa..9f9bf5ac 100644 --- a/simd/jsimd_arm.c +++ b/simd/jsimd_arm.c @@ -311,7 +311,7 @@ jsimd_can_h2v1_upsample (void) GLOBAL(void) jsimd_h2v2_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -319,7 +319,7 @@ jsimd_h2v2_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -352,7 +352,7 @@ jsimd_can_h2v1_fancy_upsample (void) GLOBAL(void) jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -360,7 +360,7 @@ jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { diff --git a/simd/jsimd_arm64.c b/simd/jsimd_arm64.c index d280d621..d217cf6b 100644 --- a/simd/jsimd_arm64.c +++ b/simd/jsimd_arm64.c @@ -266,7 +266,7 @@ jsimd_can_h2v1_upsample (void) GLOBAL(void) jsimd_h2v2_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -274,7 +274,7 @@ jsimd_h2v2_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -298,7 +298,7 @@ jsimd_can_h2v1_fancy_upsample (void) GLOBAL(void) jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -306,7 +306,7 @@ jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { diff --git a/simd/jsimd_i386.c b/simd/jsimd_i386.c index b731edb4..1037fd9f 100644 --- a/simd/jsimd_i386.c +++ b/simd/jsimd_i386.c @@ -3,7 +3,7 @@ * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright 2009-2011, 2013 D. R. Commander - * + * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. * For conditions of distribution and use, see copyright notice in jsimdext.inc @@ -395,7 +395,7 @@ jsimd_can_h2v1_upsample (void) GLOBAL(void) jsimd_h2v2_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -409,7 +409,7 @@ jsimd_h2v2_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -463,7 +463,7 @@ jsimd_can_h2v1_fancy_upsample (void) GLOBAL(void) jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -478,7 +478,7 @@ jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { diff --git a/simd/jsimd_x86_64.c b/simd/jsimd_x86_64.c index 8d17db30..afaea4b9 100644 --- a/simd/jsimd_x86_64.c +++ b/simd/jsimd_x86_64.c @@ -3,7 +3,7 @@ * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright 2009-2011 D. R. Commander - * + * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. * For conditions of distribution and use, see copyright notice in jsimdext.inc @@ -269,7 +269,7 @@ jsimd_can_h2v1_upsample (void) GLOBAL(void) jsimd_h2v2_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -280,7 +280,7 @@ jsimd_h2v2_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -321,7 +321,7 @@ jsimd_can_h2v1_fancy_upsample (void) GLOBAL(void) jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { @@ -332,7 +332,7 @@ jsimd_h2v2_fancy_upsample (j_decompress_ptr cinfo, GLOBAL(void) jsimd_h2v1_fancy_upsample (j_decompress_ptr cinfo, - jpeg_component_info * compptr, + jpeg_component_info * compptr, JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr) { diff --git a/tjbench.c b/tjbench.c index ff09cb77..14ccd00e 100644 --- a/tjbench.c +++ b/tjbench.c @@ -251,7 +251,7 @@ int decomp(unsigned char *srcbuf, unsigned char **jpegbuf, dstbuf[bindex]=abs(dstbuf[bindex]-y); } } - } + } else { for(row=0; rowGetPrimitiveArrayCritical(env, src, 0)); - if(tjDecompressHeader3(handle, jpegBuf, (unsigned long)jpegSize, + if(tjDecompressHeader3(handle, jpegBuf, (unsigned long)jpegSize, &width, &height, &jpegSubsamp, &jpegColorspace)==-1) { (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0); @@ -550,7 +550,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress { Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3IIIIIIII (env, obj, src, jpegSize, dst, 0, 0, width, stride, height, pf, flags); - + } JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressToYUV___3BI_3BIIII diff --git a/turbojpeg-mapfile.jni b/turbojpeg-mapfile.jni index 283e01f8..f9fc7e53 100755 --- a/turbojpeg-mapfile.jni +++ b/turbojpeg-mapfile.jni @@ -49,7 +49,7 @@ TURBOJPEG_1.2 Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3BIIIII; Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3IIIIII; Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressToYUV___3BI_3BI; - Java_org_libjpegturbo_turbojpeg_TJDecompressor_destroy; + Java_org_libjpegturbo_turbojpeg_TJDecompressor_destroy; Java_org_libjpegturbo_turbojpeg_TJTransformer_init; Java_org_libjpegturbo_turbojpeg_TJTransformer_transform; } TURBOJPEG_1.1; diff --git a/turbojpeg.h b/turbojpeg.h index 6c13851a..818ca6e0 100644 --- a/turbojpeg.h +++ b/turbojpeg.h @@ -563,7 +563,7 @@ typedef void* tjhandle; /** * Compute the scaled value of dimension using the given scaling * factor. This macro performs the integer equivalent of ceil(dimension * - * scalingFactor). + * scalingFactor). */ #define TJSCALED(dimension, scalingFactor) ((dimension * scalingFactor.num \ + scalingFactor.denom - 1) / scalingFactor.denom) @@ -1063,7 +1063,7 @@ DLLEXPORT int DLLCALL tjDestroy(tjhandle handle); * (re)allocation (by setting #TJFLAG_NOREALLOC.) * * @param bytes the number of bytes to allocate - * + * * @return a pointer to a newly-allocated buffer with the specified number of * bytes *