Merged master into rgbcurvesspeedup.

This commit is contained in:
Beep6581
2016-06-02 22:33:34 +02:00
81 changed files with 3557 additions and 2018 deletions

View File

@@ -84,26 +84,16 @@ PreviewImage::PreviewImage (const Glib::ustring &fname, const Glib::ustring &ext
unsigned char *dst;
#pragma omp for schedule(static,10)
for (unsigned int i = 0; i < (unsigned int)(h); i++) {
for (unsigned int i = 0; i < (unsigned int)(h); ++i) {
src = data + i * w * 3;
dst = previewImage->get_data() + i * w * 4;
for (unsigned int j = 0; j < (unsigned int)(w); j++) {
for (unsigned int j = 0; j < (unsigned int)(w); ++j) {
unsigned char r = *(src++);
unsigned char g = *(src++);
unsigned char b = *(src++);
#if __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__
*(dst++) = b;
*(dst++) = g;
*(dst++) = r;
*(dst++) = 0;
#else
*(dst++) = 0;
*(dst++) = r;
*(dst++) = g;
*(dst++) = b;
#endif
poke255_uc(dst, r, g, b);
}
}
}
@@ -171,17 +161,8 @@ PreviewImage::PreviewImage (const Glib::ustring &fname, const Glib::ustring &ext
unsigned char r = *(src++);
unsigned char g = *(src++);
unsigned char b = *(src++);
#if __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__
*(dst++) = b;
*(dst++) = g;
*(dst++) = r;
*(dst++) = 0;
#else
*(dst++) = 0;
*(dst++) = r;
*(dst++) = g;
*(dst++) = b;
#endif
poke255_uc(dst, r, g, b);
}
}
}