Changed how Image objects are handled

TheMohawkNinja · Oct 25, 2020 · 230fe11 · 230fe11
1 parent 74cec97
commit 230fe11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/WallFade b/WallFade
diff --git a/WallFade.cpp b/WallFade.cpp
@@ -52,8 +52,8 @@ string::size_type confIndex;
 stringstream stream;
 ColorRGB AVG, oldAVG[maxMonitors];
 ColorRGB ColorSample[30][30], oldColorSample[30][30];
-Image background;
-Image lastbackground;
+Image background, lastbackground;
+Image A, B, maskA, maskB, compResult;
 Display* d=XOpenDisplay(NULL);
 Screen* s=DefaultScreenOfDisplay(d);
 
@@ -708,9 +708,8 @@ int main(int argc, char **argv)
 				{
 					output(stdout,"Compositing transition step %d... ",(int)i);
 
-					Image A(newpic);
-					Image B(picpath+".cache/resizeOld"+to_string(S)+".jpg");
-					Image compResult;
+					A=Image(newpic);
+					B=Image(picpath+".cache/resizeOld"+to_string(S)+".jpg");
 
 					if(i<=steps)
 					{
@@ -729,8 +728,8 @@ int main(int argc, char **argv)
 						color="FF";
 					}
 
-					Image maskA(Geometry(bgW,bgH), Color("#"+color+color+color));
-					Image maskB(Geometry(bgW,bgH), Color("#"+invertHex(color)+invertHex(color)+invertHex(color)));
+					maskA=Image(Geometry(bgW,bgH),Color("#"+color+color+color));
+					maskB=Image(Geometry(bgW,bgH),Color("#"+invertHex(color)+invertHex(color)+invertHex(color)));
 
 					A.composite(maskA,0,0,Magick::CopyAlphaCompositeOp);
 					B.composite(maskB,0,0,Magick::CopyAlphaCompositeOp);
@@ -742,12 +741,6 @@ int main(int argc, char **argv)
 					//system(("composite -blend "+to_string((100/steps)*i)+" "+newpic+" "+picpath+".cache/resizeOld"+to_string(S)+".jpg"+" "+picpath+".cache/transition"+to_string(i)+".jpg").c_str());
 					output(stdout,"Done!\n");
 
-					A=NULL;
-					B=NULL;
-					maskA=NULL;
-					maskB=NULL;
-					compResult=NULL;
-
 					usleep(delay/steps);
 				}