FIX: minor correction to super resolution estimation

CLEANUP: Special linker paths not required here with MSYS2
spillerrec · Jan 19, 2020 · 1a2815e · 1a2815e
1 parent 91f08cb
commit 1a2815e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/interface/gui/mainwindow.cpp b/interface/gui/mainwindow.cpp
@@ -741,6 +741,7 @@ void main_widget::create_sr_sample(){
 			creator.sample_count = scale * scale;
 			creator.render(images, img);
 		}
+		update_draw();
 	} );
 }
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -92,13 +92,6 @@ set(SOURCES_OTHERS
 	MultiPlaneIterator.cpp
 	)
 
-# mingw uses a different naming for FFTW apparently # TODO: find a better solution
-if( WIN32 )
-	set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} -lfftw3-3)
-else( WIN32 )
-	set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} -lfftw3)
-endif( WIN32 )
-
 # TODO: do something smarter?
 set(FFMPEG_LIBS -lavcodec -lavutil -lavformat)
 
@@ -113,7 +106,7 @@ add_library(OvermixCore
 	${WAIFU_SOURCES} 
 	${SOURCES_OTHERS} 
 	)
-target_link_libraries(OvermixCore Qt5::Gui Qt5::Concurrent -lm -lpng -ljpeg -lz -llzma -lpugixml ${FFMPEG_LIBS} ${WAIFU_LIB} ${PLATFORM_LIBRARIES})
+target_link_libraries(OvermixCore Qt5::Gui Qt5::Concurrent -lm -lpng -ljpeg -lz -llzma -lpugixml -lfftw3 ${FFMPEG_LIBS} ${WAIFU_LIB})
 
 # C++14
 set_property(TARGET OvermixCore PROPERTY CXX_STANDARD 14)

diff --git a/src/renders/EstimatorRender.cpp b/src/renders/EstimatorRender.cpp
@@ -170,6 +170,8 @@ ImageEx EstimatorRender::render(const AContainer &group, AProcessWatcher *watche
 				est[c] = output_copy;
 		}	
 	}
+
+	est.alpha_plane() = {};
 
 	return est;
 }
diff --git a/src/utils/SRSampleCreator.cpp b/src/utils/SRSampleCreator.cpp
@@ -26,7 +26,7 @@ using namespace Overmix;
 
 void SRSampleCreator::render( ImageContainer& add_to, const ImageEx& img ) const{
 	//TODO:
-	Point<unsigned> size( (img.get_width()-3) / scale * scale, (img.get_height()-3) / scale * scale );
+	Point<unsigned> size( (img.get_width()-(scale-1)) / scale * scale, (img.get_height()-(scale-1)) / scale * scale );
 	Point<unsigned> size_lr( size.x / scale, size.y / scale );
 	for( int x=0; x<scale; x++ )
 		for( int y=0; y<scale; y++ ){
@@ -39,4 +39,5 @@ void SRSampleCreator::render( ImageContainer& add_to, const ImageEx& img ) const
 			add_to.addImage( std::move(sample), -1, -1, QString::fromUtf8(("lr_" + std::to_string(x) + "_" + std::to_string(y)).c_str()) );
 			add_to.setPos( add_to.count()-1, offset );
 		}
+	add_to.setAligned();
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -741,6 +741,7 @@ void main_widget::create_sr_sample(){ @@
     			creator.sample_count = scale * scale;
     			creator.render(images, img);
     		}
+    		update_draw();
     	} );
     }
@@ Expand Down @@