From f5b525048272b3daac6d3f9a66c597ce248b612b Mon Sep 17 00:00:00 2001 From: David Capello Date: Thu, 14 Aug 2014 23:26:52 -0300 Subject: [PATCH] Remove use of "register" modifier (it's deprecated) --- src/app/file/png_format.cpp | 60 +++++++++++++-------------- src/app/modules/palettes.cpp | 2 +- src/app/settings/ui_settings_impl.cpp | 4 +- src/app/tools/point_shape.cpp | 5 +-- src/app/tools/point_shapes.h | 2 +- src/app/util/render.cpp | 3 +- src/gfx/rect.h | 2 +- src/raster/blend.cpp | 12 +++--- src/raster/image_impl.h | 4 +- src/raster/palette.cpp | 4 +- src/raster/rotate.cpp | 8 ++-- 11 files changed, 51 insertions(+), 55 deletions(-) diff --git a/src/app/file/png_format.cpp b/src/app/file/png_format.cpp index 6eab419f6..9cf95884b 100644 --- a/src/app/file/png_format.cpp +++ b/src/app/file/png_format.cpp @@ -248,9 +248,9 @@ bool PngFormat::onLoad(FileOp* fop) /* RGB_ALPHA */ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) { - register uint8_t* src_address = row_pointer; - register uint32_t* dst_address = (uint32_t*)image->getPixelAddress(0, y); - register unsigned int x, r, g, b, a; + uint8_t* src_address = row_pointer; + uint32_t* dst_address = (uint32_t*)image->getPixelAddress(0, y); + unsigned int x, r, g, b, a; for (x=0; xgetPixelAddress(0, y); - register unsigned int x, r, g, b; + uint8_t* src_address = row_pointer; + uint32_t* dst_address = (uint32_t*)image->getPixelAddress(0, y); + unsigned int x, r, g, b; for (x=0; xgetPixelAddress(0, y); - register unsigned int x, k, a; + uint8_t* src_address = row_pointer; + uint16_t* dst_address = (uint16_t*)image->getPixelAddress(0, y); + unsigned int x, k, a; for (x=0; xgetPixelAddress(0, y); - register unsigned int x, k; + uint8_t* src_address = row_pointer; + uint16_t* dst_address = (uint16_t*)image->getPixelAddress(0, y); + unsigned int x, k; for (x=0; xgetPixelAddress(0, y); - register unsigned int x, c; + uint8_t* src_address = row_pointer; + uint8_t* dst_address = (uint8_t*)image->getPixelAddress(0, y); + unsigned int x, c; for (x=0; xgetPixelAddress(0, y); - register uint8_t* dst_address = row_pointer; - register unsigned int x, c; + uint32_t* src_address = (uint32_t*)image->getPixelAddress(0, y); + uint8_t* dst_address = row_pointer; + unsigned int x, c; for (x=0; xgetPixelAddress(0, y); - register uint8_t* dst_address = row_pointer; - register unsigned int x, c; + uint32_t* src_address = (uint32_t*)image->getPixelAddress(0, y); + uint8_t* dst_address = row_pointer; + unsigned int x, c; for (x=0; xgetPixelAddress(0, y); - register uint8_t* dst_address = row_pointer; - register unsigned int x, c; + uint16_t* src_address = (uint16_t*)image->getPixelAddress(0, y); + uint8_t* dst_address = row_pointer; + unsigned int x, c; for (x=0; xgetPixelAddress(0, y); - register uint8_t* dst_address = row_pointer; - register unsigned int x, c; + uint16_t* src_address = (uint16_t*)image->getPixelAddress(0, y); + uint8_t* dst_address = row_pointer; + unsigned int x, c; for (x=0; xgetPixelAddress(0, y); - register uint8_t* dst_address = row_pointer; - register unsigned int x; + uint8_t* src_address = (uint8_t*)image->getPixelAddress(0, y); + uint8_t* dst_address = row_pointer; + unsigned int x; for (x=0; x= 0 && index <= 255); ASSERT(r >= 0 && r <= 255); diff --git a/src/app/settings/ui_settings_impl.cpp b/src/app/settings/ui_settings_impl.cpp index c82194dca..b2882fb6d 100644 --- a/src/app/settings/ui_settings_impl.cpp +++ b/src/app/settings/ui_settings_impl.cpp @@ -473,8 +473,8 @@ void UIDocumentSettingsImpl::setGridColor(const app::Color& color) void UIDocumentSettingsImpl::snapToGrid(gfx::Point& point) const { - register int w = m_gridBounds.w; - register int h = m_gridBounds.h; + int w = m_gridBounds.w; + int h = m_gridBounds.h; div_t d, dx, dy; dx = div(m_gridBounds.x, w); diff --git a/src/app/tools/point_shape.cpp b/src/app/tools/point_shape.cpp index dc79ed6e0..d6a49f9fa 100644 --- a/src/app/tools/point_shape.cpp +++ b/src/app/tools/point_shape.cpp @@ -35,9 +35,8 @@ using namespace filters; void PointShape::doInkHline(int x1, int y, int x2, ToolLoop* loop) { - register TiledMode tiledMode = loop->getDocumentSettings()->getTiledMode(); - register int w, size; // width or height - register int x; + TiledMode tiledMode = loop->getDocumentSettings()->getTiledMode(); + int x, w, size; // width or height // Tiled in Y axis if (tiledMode & TILED_Y_AXIS) { diff --git a/src/app/tools/point_shapes.h b/src/app/tools/point_shapes.h index 226b17773..1939e9a22 100644 --- a/src/app/tools/point_shapes.h +++ b/src/app/tools/point_shapes.h @@ -49,7 +49,7 @@ public: { Brush* brush = loop->getBrush(); std::vector::const_iterator scanline = brush->scanline().begin(); - register int v, h = brush->bounds().h; + int v, h = brush->bounds().h; x += brush->bounds().x; y += brush->bounds().y; diff --git a/src/app/util/render.cpp b/src/app/util/render.cpp index 4403324fd..cfb3a5ebd 100644 --- a/src/app/util/render.cpp +++ b/src/app/util/render.cpp @@ -592,8 +592,7 @@ void RenderEngine::renderLayer( } if (src_image) { - int output_opacity; - register int t; + int t, output_opacity; output_opacity = MID(0, cel->opacity(), 255); output_opacity = INT_MULT(output_opacity, global_opacity, t); diff --git a/src/gfx/rect.h b/src/gfx/rect.h index 356819127..0da09cf93 100644 --- a/src/gfx/rect.h +++ b/src/gfx/rect.h @@ -66,7 +66,7 @@ public: RectT(const PointT& point1, const PointT& point2) { PointT leftTop = point1; PointT rightBottom = point2; - register T t; + T t; if (leftTop.x > rightBottom.x) { t = leftTop.x; diff --git a/src/raster/blend.cpp b/src/raster/blend.cpp index 11f35afe8..5a1cf08c2 100644 --- a/src/raster/blend.cpp +++ b/src/raster/blend.cpp @@ -49,7 +49,7 @@ BLEND_COLOR graya_blenders[] = int rgba_blend_normal(int back, int front, int opacity) { - register int t; + int t; if ((back & 0xff000000) == 0) { return @@ -91,9 +91,8 @@ int rgba_blend_copy(int back, int front, int opacity) int rgba_blend_forpath(int back, int front, int opacity) { - int F_r, F_g, F_b, F_a; - register int t; - + int t, F_r, F_g, F_b, F_a; + F_r = rgba_getr(front); F_g = rgba_getg(front); F_b = rgba_getb(front); @@ -202,7 +201,7 @@ int rgba_blend_blue_tint(int back, int front, int opacity) int graya_blend_normal(int back, int front, int opacity) { - register int t; + int t; if ((back & 0xff00) == 0) { return @@ -238,8 +237,7 @@ int graya_blend_copy(int back, int front, int opacity) int graya_blend_forpath(int back, int front, int opacity) { - int F_k, F_a; - register int t; + int t, F_k, F_a; F_k = graya_getv(front); F_a = graya_geta(front); diff --git a/src/raster/image_impl.h b/src/raster/image_impl.h index 2e925f2ba..d02e3fc72 100644 --- a/src/raster/image_impl.h +++ b/src/raster/image_impl.h @@ -174,7 +174,7 @@ namespace raster { address_t dst_address; int xbeg, xend, xsrc, xdst; int ybeg, yend, ysrc, ydst; - register uint32_t mask_color = src->maskColor(); + uint32_t mask_color = src->maskColor(); // nothing to do if (!opacity) @@ -350,7 +350,7 @@ namespace raster { } // with mask else { - register int mask_color = src->maskColor(); + int mask_color = src->maskColor(); for (ydst=ybeg; ydst<=yend; ++ydst, ++ysrc) { src_address = src->getPixelAddress(xsrc, ysrc); diff --git a/src/raster/palette.cpp b/src/raster/palette.cpp index 9320fc69e..c2ac687a7 100644 --- a/src/raster/palette.cpp +++ b/src/raster/palette.cpp @@ -117,7 +117,7 @@ void Palette::copyColorsTo(Palette* dst) const int Palette::countDiff(const Palette* other, int* from, int* to) const { - register int c, diff = 0; + int c, diff = 0; int min = MIN(this->m_colors.size(), other->m_colors.size()); int max = MAX(this->m_colors.size(), other->m_colors.size()); @@ -488,7 +488,7 @@ static unsigned int col_diff[3*128]; static void bestfit_init() { - register int i, k; + int i, k; for (i=1; i<64; i++) { k = i * i; diff --git a/src/raster/rotate.cpp b/src/raster/rotate.cpp index d4a1dfab5..8bd7f4c76 100644 --- a/src/raster/rotate.cpp +++ b/src/raster/rotate.cpp @@ -196,7 +196,7 @@ public: void feedLine(Image* spr, int spr_x, int spr_y) { ASSERT(m_it != m_end); - register int c = spr->getPixel(spr_x, spr_y); + int c = spr->getPixel(spr_x, spr_y); if ((rgba_geta(m_mask_color) == 0) || ((c & rgba_rgb_mask) != (m_mask_color & rgba_rgb_mask))) *m_it = m_blender(*m_it, c, 255); @@ -218,7 +218,7 @@ public: void feedLine(Image* spr, int spr_x, int spr_y) { ASSERT(m_it != m_end); - register int c = spr->getPixel(spr_x, spr_y); + int c = spr->getPixel(spr_x, spr_y); if ((graya_geta(m_mask_color) == 0) || ((c & graya_v_mask) != (m_mask_color & graya_v_mask))) *m_it = m_blender(*m_it, c, 255); @@ -239,7 +239,7 @@ public: void feedLine(Image* spr, int spr_x, int spr_y) { ASSERT(m_it != m_end); - register int c = spr->getPixel(spr_x, spr_y); + int c = spr->getPixel(spr_x, spr_y); if (c != m_mask_color) *m_it = c; ++m_it; @@ -254,7 +254,7 @@ public: void feedLine(Image* spr, int spr_x, int spr_y) { ASSERT(m_it != m_end); - register int c = spr->getPixel(spr_x, spr_y); + int c = spr->getPixel(spr_x, spr_y); if (c != 0) // TODO *m_it = c; ++m_it;