mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-28 05:37:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unused variable warnings when we compile in release mode

Browse Source
This commit is contained in:
David Capello 2014-08-17 20:33:32 -03:00
parent 78b755bd40
commit a1912d38bd
7 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/util/render.cpp
View File

@ -180,12 +180,17 @@ static void merge_zoomed_image(Image* dst, const Image* src, const Palette* pal,
typedef std::vector<typename DstTraits::pixel_t> Scanline;
Scanline scanline(src_w);
typename Scanline::iterator scanline_it;
#ifdef _DEBUG
typename Scanline::iterator scanline_end = scanline.end();
#endif
// Lock all necessary bits
const LockImageBits<SrcTraits> srcBits(src, gfx::Rect(src_x, src_y, src_w, src_h));
LockImageBits<DstTraits> dstBits(dst, gfx::Rect(dst_x, dst_y, dst_w, dst_h));
typename LockImageBits<SrcTraits>::const_iterator src_it = srcBits.begin(), src_end = srcBits.end();
typename LockImageBits<SrcTraits>::const_iterator src_it = srcBits.begin();
#ifdef _DEBUG
typename LockImageBits<SrcTraits>::const_iterator src_end = srcBits.end();
#endif
typename LockImageBits<DstTraits>::iterator dst_it, dst_end;
// For each line to draw of the source image...

2
src/base/string.cpp
View File

@ -147,7 +147,9 @@ std::wstring from_utf8(const std::string& src)
int required_size = utf8_length(src);
std::vector<wchar_t> buf(++required_size);
std::vector<wchar_t>::iterator buf_it = buf.begin();
#ifdef _DEBUG
std::vector<wchar_t>::iterator buf_end = buf.end();
#endif
utf8_const_iterator it(src.begin());
utf8_const_iterator end(src.end());

5
src/raster/conversion_alleg.cpp
View File

@ -137,7 +137,10 @@ template<typename ImageTraits>
void convert_image_to_allegro_templ(const Image* image, BITMAP* bmp, int _x, int _y, const Palette* palette)
{
const LockImageBits<ImageTraits> bits(image);
typename LockImageBits<ImageTraits>::const_iterator src_it = bits.begin(), src_end = bits.end();
typename LockImageBits<ImageTraits>::const_iterator src_it = bits.begin();
#ifdef _DEBUG
typename LockImageBits<ImageTraits>::const_iterator src_end = bits.end();
#endif
int depth = bitmap_color_depth(bmp);
int x, y, w = image->width(), h = image->height();
unsigned long bmp_address;

5
src/raster/conversion_she.cpp
View File

@ -87,7 +87,10 @@ void convert_image_to_surface_templ(const Image* image, she::LockedSurface* dst,
int src_x, int src_y, int dst_x, int dst_y, int w, int h, const Palette* palette, const she::SurfaceFormatData* fd)
{
const LockImageBits<ImageTraits> bits(image, gfx::Rect(src_x, src_y, w, h));
typename LockImageBits<ImageTraits>::const_iterator src_it = bits.begin(), src_end = bits.end();
typename LockImageBits<ImageTraits>::const_iterator src_it = bits.begin();
#ifdef _DEBUG
typename LockImageBits<ImageTraits>::const_iterator src_end = bits.end();
#endif
for (int v=0; v<h; ++v, ++dst_y) {
AddressType dst_address = AddressType(dst->getData(dst_x, dst_y));

15
src/raster/mask.cpp
View File

@ -233,7 +233,10 @@ void Mask::byColor(const Image *src, int color, int fuzziness)
const LockImageBits<RgbTraits> srcBits(src);
LockImageBits<BitmapTraits> dstBits(dst, Image::WriteLock);
LockImageBits<RgbTraits>::const_iterator src_it = srcBits.begin(), src_end = srcBits.end();
LockImageBits<BitmapTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<BitmapTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<BitmapTraits>::iterator dst_end = dstBits.end();
#endif
int src_r, src_g, src_b, src_a;
int dst_r, dst_g, dst_b, dst_a;
color_t c;
@ -266,7 +269,10 @@ void Mask::byColor(const Image *src, int color, int fuzziness)
const LockImageBits<GrayscaleTraits> srcBits(src);
LockImageBits<BitmapTraits> dstBits(dst, Image::WriteLock);
LockImageBits<GrayscaleTraits>::const_iterator src_it = srcBits.begin(), src_end = srcBits.end();
LockImageBits<BitmapTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<BitmapTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<BitmapTraits>::iterator dst_end = dstBits.end();
#endif
int src_k, src_a;
int dst_k, dst_a;
color_t c;
@ -293,7 +299,10 @@ void Mask::byColor(const Image *src, int color, int fuzziness)
const LockImageBits<IndexedTraits> srcBits(src);
LockImageBits<BitmapTraits> dstBits(dst, Image::WriteLock);
LockImageBits<IndexedTraits>::const_iterator src_it = srcBits.begin(), src_end = srcBits.end();
LockImageBits<BitmapTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<BitmapTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<BitmapTraits>::iterator dst_end = dstBits.end();
#endif
color_t c, min, max;
for (; src_it != src_end; ++src_it, ++dst_it) {

35
src/raster/quantization.cpp
View File

@ -126,7 +126,10 @@ Image* convert_pixel_format(
// RGB -> Grayscale
case IMAGE_GRAYSCALE: {
LockImageBits<GrayscaleTraits> dstBits(new_image, Image::WriteLock);
LockImageBits<GrayscaleTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<GrayscaleTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<GrayscaleTraits>::iterator dst_end = dstBits.end();
#endif
for (; src_it != src_end; ++src_it, ++dst_it) {
ASSERT(dst_it != dst_end);
@ -145,7 +148,10 @@ Image* convert_pixel_format(
// RGB -> Indexed
case IMAGE_INDEXED: {
LockImageBits<IndexedTraits> dstBits(new_image, Image::WriteLock);
LockImageBits<IndexedTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<IndexedTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<IndexedTraits>::iterator dst_end = dstBits.end();
#endif
for (; src_it != src_end; ++src_it, ++dst_it) {
ASSERT(dst_it != dst_end);
@ -176,7 +182,10 @@ Image* convert_pixel_format(
// Grayscale -> RGB
case IMAGE_RGB: {
LockImageBits<RgbTraits> dstBits(new_image, Image::WriteLock);
LockImageBits<RgbTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<RgbTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<RgbTraits>::iterator dst_end = dstBits.end();
#endif
for (; src_it != src_end; ++src_it, ++dst_it) {
ASSERT(dst_it != dst_end);
@ -198,7 +207,10 @@ Image* convert_pixel_format(
// Grayscale -> Indexed
case IMAGE_INDEXED: {
LockImageBits<IndexedTraits> dstBits(new_image, Image::WriteLock);
LockImageBits<IndexedTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<IndexedTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<IndexedTraits>::iterator dst_end = dstBits.end();
#endif
for (; src_it != src_end; ++src_it, ++dst_it) {
ASSERT(dst_it != dst_end);
@ -225,7 +237,10 @@ Image* convert_pixel_format(
// Indexed -> RGB
case IMAGE_RGB: {
LockImageBits<RgbTraits> dstBits(new_image, Image::WriteLock);
LockImageBits<RgbTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<RgbTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<RgbTraits>::iterator dst_end = dstBits.end();
#endif
for (; src_it != src_end; ++src_it, ++dst_it) {
ASSERT(dst_it != dst_end);
@ -245,7 +260,10 @@ Image* convert_pixel_format(
// Indexed -> Grayscale
case IMAGE_GRAYSCALE: {
LockImageBits<GrayscaleTraits> dstBits(new_image, Image::WriteLock);
LockImageBits<GrayscaleTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<GrayscaleTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<GrayscaleTraits>::iterator dst_end = dstBits.end();
#endif
for (; src_it != src_end; ++src_it, ++dst_it) {
ASSERT(dst_it != dst_end);
@ -269,7 +287,10 @@ Image* convert_pixel_format(
// Indexed -> Indexed
case IMAGE_INDEXED: {
LockImageBits<IndexedTraits> dstBits(new_image, Image::WriteLock);
LockImageBits<IndexedTraits>::iterator dst_it = dstBits.begin(), dst_end = dstBits.end();
LockImageBits<IndexedTraits>::iterator dst_it = dstBits.begin();
#ifdef _DEBUG
LockImageBits<IndexedTraits>::iterator dst_end = dstBits.end();
#endif
color_t dstMaskColor = new_image->maskColor();
for (; src_it != src_end; ++src_it, ++dst_it) {

2
third_party/gtest/include/gtest/internal/gtest-linked_ptr.h vendored
View File

@ -175,8 +175,10 @@ class linked_ptr {
// Release ownership of the pointed object and returns it.
// Sole ownership by this linked_ptr object is required.
T* release() {
#ifdef _DEBUG
bool last = link_.depart();
assert(last);
#endif
T* v = value_;
value_ = NULL;
return v;