From dcd26f76ef0592a57e56dc9e25b792e8b7edbb5a Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 19 Dec 2019 17:32:07 +0100 Subject: [PATCH] Fixed misspelled variable --- src/Layer/PaintingArea.cpp | 8 ++++---- src/Layer/PaintingArea.h | 2 +- src/Tool/IntelliTool.cpp | 2 +- src/Tool/IntelliToolFloodFill.cpp | 2 +- src/Tool/IntelliToolPolygon.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Layer/PaintingArea.cpp b/src/Layer/PaintingArea.cpp index 2a0337d..66f4838 100644 --- a/src/Layer/PaintingArea.cpp +++ b/src/Layer/PaintingArea.cpp @@ -56,7 +56,7 @@ void PaintingArea::setUp(int maxWidth, int maxHeight){ int PaintingArea::addLayer(int width, int height, int widthOffset, int heightOffset, ImageType type){ LayerObject newLayer; newLayer.width = width; - newLayer.hight = height; + newLayer.height = height; newLayer.widthOffset = widthOffset; newLayer.hightOffset = heightOffset; if(type==ImageType::Raster_Image){ @@ -216,7 +216,7 @@ int PaintingArea::getWidthOfActive(){ } int PaintingArea::getHeightOfActive(){ - return this->layerBundle[activeLayer].hight; + return this->layerBundle[activeLayer].height; } // If a mouse button is pressed check if it was the @@ -317,7 +317,7 @@ void PaintingArea::assembleLayers(bool forSaving){ QImage cpy = layer.image->getDisplayable(layer.alpha); QColor clr_0; QColor clr_1; - for(int y=0; y=maxHeight) break; for(int x=0; x=0){ LayerObject newLayer; newLayer.alpha = 255; - newLayer.hight = layerBundle[idx].hight; + newLayer.height = layerBundle[idx].height; newLayer.width = layerBundle[idx].width; newLayer.hightOffset = layerBundle[idx].hightOffset; newLayer.widthOffset = layerBundle[idx].widthOffset; diff --git a/src/Layer/PaintingArea.h b/src/Layer/PaintingArea.h index 70d2b6e..735180a 100644 --- a/src/Layer/PaintingArea.h +++ b/src/Layer/PaintingArea.h @@ -16,7 +16,7 @@ struct LayerObject{ IntelliImage* image; int width; - int hight; + int height; int widthOffset; int hightOffset; int alpha=255; diff --git a/src/Tool/IntelliTool.cpp b/src/Tool/IntelliTool.cpp index 4d085ea..73a8f95 100644 --- a/src/Tool/IntelliTool.cpp +++ b/src/Tool/IntelliTool.cpp @@ -56,7 +56,7 @@ void IntelliTool::createToolLayer(){ void IntelliTool::mergeToolLayer(){ QColor clr_0; QColor clr_1; - for(int y=0; yhight; y++){ + for(int y=0; yheight; y++){ for(int x=0; xwidth; x++){ clr_0=Active->image->imageData.pixelColor(x,y); clr_1=Canvas->image->imageData.pixelColor(x,y); diff --git a/src/Tool/IntelliToolFloodFill.cpp b/src/Tool/IntelliToolFloodFill.cpp index 1f1503d..1a480d1 100644 --- a/src/Tool/IntelliToolFloodFill.cpp +++ b/src/Tool/IntelliToolFloodFill.cpp @@ -57,7 +57,7 @@ void IntelliToolFloodFill::onMouseLeftPressed(int x, int y){ Canvas->image->drawPixel(top,newColor); Q.push(top); } - if((down.y() < Canvas->hight) && (Canvas->image->getPixelColor(down) != newColor) && (Active->image->getPixelColor(down) == oldColor)){ + if((down.y() < Canvas->height) && (Canvas->image->getPixelColor(down) != newColor) && (Active->image->getPixelColor(down) == oldColor)){ Canvas->image->drawPixel(down,newColor); Q.push(down); } diff --git a/src/Tool/IntelliToolPolygon.cpp b/src/Tool/IntelliToolPolygon.cpp index 89ad9fb..f72094e 100644 --- a/src/Tool/IntelliToolPolygon.cpp +++ b/src/Tool/IntelliToolPolygon.cpp @@ -56,7 +56,7 @@ void IntelliToolPolygon::onMouseLeftReleased(int x, int y){ QColor colorTwo(colorPicker->getSecondColor()); colorTwo.setAlpha(alphaInner); for(int i = 0; i < Active->width; i++){ - for(int j = 0; j < Active->hight; j++){ + for(int j = 0; j < Active->height; j++){ Point = QPoint(i,j); if(IntelliHelper::isInPolygon(Triangles,Point)){ this->Canvas->image->drawPixel(Point, colorTwo);