creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-15 04:40:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed misspelled variable

Browse Source
This commit is contained in:
Conrad
2019-12-19 17:32:07 +01:00
parent a2f2e38a06
commit dcd26f76ef
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Layer/PaintingArea.cpp
View File

@@ -56,7 +56,7 @@ void PaintingArea::setUp(int maxWidth, int maxHeight){
int PaintingArea::addLayer(int width, int height, int widthOffset, int heightOffset, ImageType type){ int PaintingArea::addLayer(int width, int height, int widthOffset, int heightOffset, ImageType type){
LayerObject newLayer; LayerObject newLayer;
newLayer.width = width; newLayer.width = width;
newLayer.hight = height; newLayer.height = height;
newLayer.widthOffset = widthOffset; newLayer.widthOffset = widthOffset;
newLayer.hightOffset = heightOffset; newLayer.hightOffset = heightOffset;
if(type==ImageType::Raster_Image){ if(type==ImageType::Raster_Image){
@@ -216,7 +216,7 @@ int PaintingArea::getWidthOfActive(){
} }
int PaintingArea::getHeightOfActive(){ int PaintingArea::getHeightOfActive(){
return this->layerBundle[activeLayer].hight; return this->layerBundle[activeLayer].height;
} }
// If a mouse button is pressed check if it was the // 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); QImage cpy = layer.image->getDisplayable(layer.alpha);
QColor clr_0; QColor clr_0;
QColor clr_1; QColor clr_1;
for(int y=0; y<layer.hight; y++){ for(int y=0; y<layer.height; y++){
if(layer.hightOffset+y<0) continue; if(layer.hightOffset+y<0) continue;
if(layer.hightOffset+y>=maxHeight) break; if(layer.hightOffset+y>=maxHeight) break;
for(int x=0; x<layer.width; x++){ for(int x=0; x<layer.width; x++){
@@ -345,7 +345,7 @@ void PaintingArea::createTempLayerAfter(int idx){
if(idx>=0){ if(idx>=0){
LayerObject newLayer; LayerObject newLayer;
newLayer.alpha = 255; newLayer.alpha = 255;
newLayer.hight = layerBundle[idx].hight; newLayer.height = layerBundle[idx].height;
newLayer.width = layerBundle[idx].width; newLayer.width = layerBundle[idx].width;
newLayer.hightOffset = layerBundle[idx].hightOffset; newLayer.hightOffset = layerBundle[idx].hightOffset;
newLayer.widthOffset = layerBundle[idx].widthOffset; newLayer.widthOffset = layerBundle[idx].widthOffset;

2
src/Layer/PaintingArea.h
View File

@@ -16,7 +16,7 @@
struct LayerObject{ struct LayerObject{
IntelliImage* image; IntelliImage* image;
int width; int width;
int hight; int height;
int widthOffset; int widthOffset;
int hightOffset; int hightOffset;
int alpha=255; int alpha=255;

2
src/Tool/IntelliTool.cpp
View File

@@ -56,7 +56,7 @@ void IntelliTool::createToolLayer(){
void IntelliTool::mergeToolLayer(){ void IntelliTool::mergeToolLayer(){
QColor clr_0; QColor clr_0;
QColor clr_1; QColor clr_1;
for(int y=0; y<Active->hight; y++){ for(int y=0; y<Active->height; y++){
for(int x=0; x<Active->width; x++){ for(int x=0; x<Active->width; x++){
clr_0=Active->image->imageData.pixelColor(x,y); clr_0=Active->image->imageData.pixelColor(x,y);
clr_1=Canvas->image->imageData.pixelColor(x,y); clr_1=Canvas->image->imageData.pixelColor(x,y);

2
src/Tool/IntelliToolFloodFill.cpp
View File

@@ -57,7 +57,7 @@ void IntelliToolFloodFill::onMouseLeftPressed(int x, int y){
Canvas->image->drawPixel(top,newColor); Canvas->image->drawPixel(top,newColor);
Q.push(top); 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); Canvas->image->drawPixel(down,newColor);
Q.push(down); Q.push(down);
} }

2
src/Tool/IntelliToolPolygon.cpp
View File

@@ -56,7 +56,7 @@ void IntelliToolPolygon::onMouseLeftReleased(int x, int y){
QColor colorTwo(colorPicker->getSecondColor()); QColor colorTwo(colorPicker->getSecondColor());
colorTwo.setAlpha(alphaInner); colorTwo.setAlpha(alphaInner);
for(int i = 0; i < Active->width; i++){ 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); Point = QPoint(i,j);
if(IntelliHelper::isInPolygon(Triangles,Point)){ if(IntelliHelper::isInPolygon(Triangles,Point)){
this->Canvas->image->drawPixel(Point, colorTwo); this->Canvas->image->drawPixel(Point, colorTwo);