mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compilation fixes

metadata
Wenzel Jakob 2013-05-20 17:28:38 -04:00
parent 7f36735c0d
commit 464da09474
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mitsuba/core/bitmap.h
View File

@ -700,7 +700,7 @@ public:
void flipVertically(); void flipVertically();
/// Perform the specified rotatation & flip operation /// Perform the specified rotatation & flip operation
void rotateFlip(ERotateFlipType type) const; ref<Bitmap> rotateFlip(ERotateFlipType type) const;
/** /**
* \brief Accumulate the contents of another bitmap into the * \brief Accumulate the contents of another bitmap into the

26
src/libcore/bitmap.cpp
View File

@ -427,8 +427,7 @@ ref<Bitmap> Bitmap::rotateFlip(ERotateFlipType type) const {
if (m_componentFormat == EBitmask) if (m_componentFormat == EBitmask)
Log(EError, "Transformations involving bitmasks are currently not supported!"); Log(EError, "Transformations involving bitmasks are currently not supported!");
int width = m_width, height = m_height; int width = m_size.x, height = m_size.y;
int bypp = getBytesPerPixel();
bool flip_x = (type & 6) == 2 || (type & 6) == 4; bool flip_x = (type & 6) == 2 || (type & 6) == 4;
bool flip_y = (type & 3) == 1 || (type & 3) == 2; bool flip_y = (type & 3) == 1 || (type & 3) == 2;
bool rotate_90 = type & 1; bool rotate_90 = type & 1;
@ -436,21 +435,23 @@ ref<Bitmap> Bitmap::rotateFlip(ERotateFlipType type) const {
if (rotate_90) if (rotate_90)
std::swap(width, height); std::swap(width, height);
ref<Bitmap> result = new Bitmap(width, height); ref<Bitmap> result = new Bitmap(m_pixelFormat, m_componentFormat,
Vector2i(width, height), m_channelCount);
int src_stride = m_width * bypp, ssize_t bypp = getBytesPerPixel(),
dst_stride = width * bypp; src_stride = m_size.x * bypp,
dst_stride = width * bypp;
uint8_t *dst = result->getUInt8Data(); uint8_t *dst = result->getUInt8Data();
uint8_t *dst_row = dst, *src_row = m_data;
uint8_t *dst_row = dst, *src_row = src;
if (flip_x) if (flip_x)
src_row += bypp * (m_width - 1); src_row += bypp * (m_size.x - 1);
if (flip_y) if (flip_y)
src_row += src_stride * (m_height - 1); src_row += src_stride * (m_size.y - 1);
int src_x_step, src_y_step; ssize_t src_x_step, src_y_step;
if (rotate_90) { if (rotate_90) {
src_x_step = flip_y ? -src_stride : src_stride; src_x_step = flip_y ? -src_stride : src_stride;
src_y_step = flip_x ? -bypp : bypp; src_y_step = flip_x ? -bypp : bypp;
@ -459,11 +460,11 @@ ref<Bitmap> Bitmap::rotateFlip(ERotateFlipType type) const {
src_y_step = flip_y ? -src_stride : src_stride; src_y_step = flip_y ? -src_stride : src_stride;
} }
for (size_t y=0; y<height; y++) { for (int y=0; y<height; y++) {
uint8_t *src_pixel = src_row; uint8_t *src_pixel = src_row;
uint8_t *dst_pixel = dst_row; uint8_t *dst_pixel = dst_row;
for (size_t x=0; x<width; x++) { for (int x=0; x<width; x++) {
memcpy(dst_pixel, src_pixel, bypp); memcpy(dst_pixel, src_pixel, bypp);
dst_pixel += bypp; dst_pixel += bypp;
src_pixel += src_x_step; src_pixel += src_x_step;
@ -472,8 +473,9 @@ ref<Bitmap> Bitmap::rotateFlip(ERotateFlipType type) const {
src_row += src_y_step; src_row += src_y_step;
dst_row += dst_stride; dst_row += dst_stride;
} }
}
return result;
}
void Bitmap::accumulate(const Bitmap *bitmap, Point2i sourceOffset, void Bitmap::accumulate(const Bitmap *bitmap, Point2i sourceOffset,
Point2i targetOffset, Vector2i size) { Point2i targetOffset, Vector2i size) {