aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/src/Pgn.cpp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-04-27 14:23:39 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-04-27 14:23:39 +0200
commit9b94209f53782ecaf7084722ce90836573ceb86b (patch)
tree42354553aeeb29d9490a3120f0c5cd687cbad370 /nxcomp/src/Pgn.cpp
parent91d9218c0cc659f40918af6ac6c035c6c48d2c6d (diff)
parent16f6803f1597788b3bebcfa15e8900d8420b54a4 (diff)
downloadnx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.gz
nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.bz2
nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.zip
Merge branch 'uli42-pr/various9' into 3.6.x
Attributes GH PR #1029: https://github.com/ArcticaProject/nx-libs/pull/1029
Diffstat (limited to 'nxcomp/src/Pgn.cpp')
-rw-r--r--nxcomp/src/Pgn.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/nxcomp/src/Pgn.cpp b/nxcomp/src/Pgn.cpp
index 649227f52..b1862f3c6 100644
--- a/nxcomp/src/Pgn.cpp
+++ b/nxcomp/src/Pgn.cpp
@@ -475,7 +475,7 @@ int DecompressPng16(unsigned char *compressedData, int compressedLen,
//
// Follow the server byte order when arranging data.
//
-
+
if (byteOrder == LSBFirst)
{
data[0] = (unsigned char) (pixel & 0xff);
@@ -486,8 +486,8 @@ int DecompressPng16(unsigned char *compressedData, int compressedLen,
data[1] = (unsigned char) (pixel & 0xff);
data[0] = (unsigned char) ((pixel >> 8) & 0xff);
}
-
- data += 2;
+
+ data += 2;
}
//
@@ -594,7 +594,7 @@ int DecompressPng24(unsigned char *compressedData, int compressedLen,
pixelPtr = (CARD8 *) dstBuf;
rowPointers = (png_byte *)tmpBuf;
-
+
if (setjmp(png_jmpbuf(pngPtr)))
{
#ifdef PANIC
@@ -668,7 +668,7 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen,
pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (!pngPtr)
- {
+ {
#ifdef PANIC
*logofs << "DecompressPng32: PANIC! "
<< "Failed png_create_read_struct operation"
@@ -681,13 +681,13 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen,
infoPtr = png_create_info_struct(pngPtr);
if (!infoPtr)
- {
+ {
#ifdef PANIC
*logofs << "DecompressPng32: PANIC! "
<< "Failed png_create_info_struct operation."
<< ".\n" << logofs_flush;
#endif
-
+
png_destroy_read_struct(&pngPtr, NULL, NULL);
return -1;
@@ -707,7 +707,7 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen,
}
png_set_read_fn(pngPtr, (void *)compressedData, PngReadData);
-
+
if (setjmp(png_jmpbuf(pngPtr)))
{
#ifdef PANIC
@@ -738,7 +738,7 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen,
data = dstBuf;
rowPointers = (png_byte *) tmpBuf;
-
+
if (setjmp(png_jmpbuf(pngPtr)))
{
#ifdef PANIC