Skip to content

D
dlib
Commit 58888fcb authored by Davis King's avatar Davis King
Browse files
Options

Merged

parents b95cb7d4 69b3894f
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
dlib/image_loader/image_loader.h
View file @ 58888fcb
...@@ -44,7 +44,7 @@ namespace dlib ...@@ -44,7 +44,7 @@ namespace dlib
unsigned long bfReserved; unsigned long bfReserved;
unsigned long biSize; unsigned long biSize;
unsigned long biWidth; unsigned long biWidth;
unsigned long biHeight; long biHeight;
unsigned short biBitCount; unsigned short biBitCount;
unsigned long biCompression; unsigned long biCompression;
/* /*
...@@ -111,6 +111,10 @@ namespace dlib ...@@ -111,6 +111,10 @@ namespace dlib
a = buf[i]; b = buf[i+1]; c = buf[i+2]; d = buf[i+3]; a = buf[i]; b = buf[i+1]; c = buf[i+2]; d = buf[i+3];
biHeight = a | (b<<8) | (c<<16) | (d<<24); biHeight = a | (b<<8) | (c<<16) | (d<<24);
bool bottomUp = biHeight < 0;
if (bottomUp)
biHeight = 0 - biHeight;
i += 4+2; i += 4+2;
a = buf[i]; b = buf[i+1]; a = buf[i]; b = buf[i+1];
biBitCount = static_cast<unsigned short>(a | (b<<8)); biBitCount = static_cast<unsigned short>(a | (b<<8));
...@@ -216,7 +220,7 @@ namespace dlib ...@@ -216,7 +220,7 @@ namespace dlib
p.red = red[pixels[i]]; p.red = red[pixels[i]];
p.green = green[pixels[i]]; p.green = green[pixels[i]];
p.blue = blue[pixels[i]]; p.blue = blue[pixels[i]];
assign_pixel(image[row][col+i],p); assign_pixel(image[bottomUp ? biHeight - row - 1 : row][col+i],p);
} }
} }
if (in.sgetn(reinterpret_cast<char*>(buf),padding) != padding) if (in.sgetn(reinterpret_cast<char*>(buf),padding) != padding)
...@@ -281,14 +285,14 @@ namespace dlib ...@@ -281,14 +285,14 @@ namespace dlib
p.red = red[pixel1]; p.red = red[pixel1];
p.green = green[pixel1]; p.green = green[pixel1];
p.blue = blue[pixel1]; p.blue = blue[pixel1];
assign_pixel(image[row][col], p); assign_pixel(image[bottomUp ? biHeight - row - 1 : row][col], p);
if (col+1 < biWidth) if (col+1 < biWidth)
{ {
p.red = red[pixel2]; p.red = red[pixel2];
p.green = green[pixel2]; p.green = green[pixel2];
p.blue = blue[pixel2]; p.blue = blue[pixel2];
assign_pixel(image[row][col+1], p); assign_pixel(image[bottomUp ? biHeight - row - 1 : row][col+1], p);
} }
} }
if (in.sgetn(reinterpret_cast<char*>(buf),padding) != padding) if (in.sgetn(reinterpret_cast<char*>(buf),padding) != padding)
...@@ -359,7 +363,7 @@ namespace dlib ...@@ -359,7 +363,7 @@ namespace dlib
p.red = red[buf[0]]; p.red = red[buf[0]];
p.green = green[buf[0]]; p.green = green[buf[0]];
p.blue = blue[buf[0]]; p.blue = blue[buf[0]];
assign_pixel(image[row][col],p); assign_pixel(image[bottomUp ? biHeight - row - 1 : row][col],p);
} }
if (in.sgetn(reinterpret_cast<char*>(buf),padding) != padding) if (in.sgetn(reinterpret_cast<char*>(buf),padding) != padding)
throw image_load_error("bmp load error 9: file too short"); throw image_load_error("bmp load error 9: file too short");
...@@ -434,7 +438,7 @@ namespace dlib ...@@ -434,7 +438,7 @@ namespace dlib
p.red = red[buf[0]]; p.red = red[buf[0]];
p.green = green[buf[0]]; p.green = green[buf[0]];
p.blue = blue[buf[0]]; p.blue = blue[buf[0]];
assign_pixel(image[row][col],p); assign_pixel(image[bottomUp ? biHeight - row - 1 : row][col],p);
++col; ++col;
} }
...@@ -469,7 +473,7 @@ namespace dlib ...@@ -469,7 +473,7 @@ namespace dlib
p.red = red[command]; p.red = red[command];
p.green = green[command]; p.green = green[command];
p.blue = blue[command]; p.blue = blue[command];
assign_pixel(image[row][col],p); assign_pixel(image[bottomUp ? biHeight - row - 1 : row][col],p);
++col; ++col;
} }
...@@ -521,7 +525,7 @@ namespace dlib ...@@ -521,7 +525,7 @@ namespace dlib
p.red = buf[2]; p.red = buf[2];
p.green = buf[1]; p.green = buf[1];
p.blue = buf[0]; p.blue = buf[0];
assign_pixel(image[row][col], p); assign_pixel(image[bottomUp ? biHeight - row - 1 : row][col], p);
} }
if (in.sgetn(reinterpret_cast<char*>(buf),padding) != padding) if (in.sgetn(reinterpret_cast<char*>(buf),padding) != padding)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment