Kristian/scanned-image-extractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Kristian:main
Branches Tags
Kristian:main
Kristian:v0.2.7-beta
Kristian:v0.2.601-beta
..
compare: Kristian:v0.2.601-beta
Branches Tags
Kristian:main
Kristian:v0.2.7-beta
Kristian:v0.2.601-beta

No commits in common. "main" and "v0.2.601-beta" have entirely different histories.
main ... v0.2.601-b

2 changed files with 10 additions and 23 deletions
Show Stats Expand all files Collapse all files

23
flake.nix
View File

@ -15,7 +15,6 @@
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
name = "scannedImageExtractor"; name = "scannedImageExtractor";
version = "0.2.7-beta";
in { in {
packages.${system} = { packages.${system} = {
default = let default = let
@ -36,14 +35,14 @@
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
cmake cmake
opencv3 opencv2
liblbfgs liblbfgs
qt5.full qt5.full
libsForQt5.qt5.wrapQtAppsHook libsForQt5.qt5.wrapQtAppsHook
]; ];
configurePhase = '' configurePhase = ''
cmake scannerExtract -DCMAKE_BUILD_TYPE=release cmake scannerExtract -DCMAKE_BUILD_TYPE=release -DOPENCV2=1
''; '';
buildPhase = '' buildPhase = ''
@ -58,7 +57,7 @@
# Install icons # Install icons
for dimension in 128 256; do for dimension in 128 256; do
install -m 444 $src/scannerExtract/ico/${name}''${dimension}x''${dimension}.png -D $out/share/icons/hicolor/''${dimension}x''${dimension}/apps/${name}.png install -m 444 $src/scannerExtract/ico/${name}''${dimension}x''${dimension}.png -D $out/share/icons/''${dimension}x''${dimension}/apps/${name}.png
done done
''; '';
}; };
@ -73,7 +72,7 @@
dontBuild = true; dontBuild = true;
installPhase = '' installPhase = ''
install -m 555 $src -D $out/${name}-v${version}.AppImage install -m 555 $src -D $out/${name}.AppImage
''; '';
}; };
}; };
@ -81,25 +80,19 @@
apps.${system} = { apps.${system} = {
appImage = { appImage = {
program = "${pkgs.writeShellScript "scannedImageExtractor" '' program = "${pkgs.writeShellScript "scannedImageExtractor" ''
${pkgs.appimage-run}/bin/appimage-run ${self.packages.${system}.appImage}/${name}-v${version}.AppImage ${pkgs.appimage-run}/bin/appimage-run ${self.packages.${system}.appImage}/${name}.AppImage
''}"; ''}";
type = "app"; type = "app";
}; };
}; };
overlays = { devShells = {
default = final: prev: {
scanned-image-extractor = self.packages.${system}.default;
};
};
devShells.${system} = {
default = pkgs.mkShellNoCC { default = pkgs.mkShellNoCC {
packages = with pkgs; [ packages = with pkgs; [
cmake cmake
opencv3 opencv2
liblbfgs liblbfgs
qt5.full gt5.full
appimage-run appimage-run
]; ];

10
scannerExtract/preloadsource.cpp
View File

@ -194,20 +194,14 @@ void PreloadSource::getSumOfRectangleSampling(const QVector<cv::Point2f> pts,
sumValues = 0; sumValues = 0;
numPixels = 0; numPixels = 0;
IplImage tmp = cvIplImage(image); IplImage tmp = image;
assert(image.type() == CV_8U); assert(image.type() == CV_8U);
for (int i=0; i<4; i++) for (int i=0; i<4; i++)
{ {
CvLineIterator iterator; CvLineIterator iterator;
const int count = cvInitLineIterator( const int count = cvInitLineIterator( &tmp, pts[i], pts[(i+1)%4], &iterator, 4);
&tmp,
cvPoint(cvRound(pts[i].x), cvRound(pts[i].y)),
cvPoint(cvRound(pts[(i + 1) % 4].x), cvRound(pts[(i + 1) % 4].y)),
&iterator,
4
);
for( int j = 0; j < count; j++ ){ for( int j = 0; j < count; j++ ){
sumValues += iterator.ptr[0]; sumValues += iterator.ptr[0];