Compare commits
No commits in common. "main" and "v0.2.601-beta" have entirely different histories.
main
...
v0.2.601-b
23
flake.nix
23
flake.nix
@ -15,7 +15,6 @@
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
|
||||
name = "scannedImageExtractor";
|
||||
version = "0.2.7-beta";
|
||||
in {
|
||||
packages.${system} = {
|
||||
default = let
|
||||
@ -36,14 +35,14 @@
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
cmake
|
||||
opencv3
|
||||
opencv2
|
||||
liblbfgs
|
||||
qt5.full
|
||||
libsForQt5.qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
cmake scannerExtract -DCMAKE_BUILD_TYPE=release
|
||||
cmake scannerExtract -DCMAKE_BUILD_TYPE=release -DOPENCV2=1
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
@ -58,7 +57,7 @@
|
||||
|
||||
# Install icons
|
||||
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
|
||||
'';
|
||||
};
|
||||
@ -73,7 +72,7 @@
|
||||
dontBuild = true;
|
||||
|
||||
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} = {
|
||||
appImage = {
|
||||
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";
|
||||
};
|
||||
};
|
||||
|
||||
overlays = {
|
||||
default = final: prev: {
|
||||
scanned-image-extractor = self.packages.${system}.default;
|
||||
};
|
||||
};
|
||||
|
||||
devShells.${system} = {
|
||||
devShells = {
|
||||
default = pkgs.mkShellNoCC {
|
||||
packages = with pkgs; [
|
||||
cmake
|
||||
opencv3
|
||||
opencv2
|
||||
liblbfgs
|
||||
qt5.full
|
||||
gt5.full
|
||||
|
||||
appimage-run
|
||||
];
|
||||
|
@ -194,20 +194,14 @@ void PreloadSource::getSumOfRectangleSampling(const QVector<cv::Point2f> pts,
|
||||
sumValues = 0;
|
||||
numPixels = 0;
|
||||
|
||||
IplImage tmp = cvIplImage(image);
|
||||
IplImage tmp = image;
|
||||
assert(image.type() == CV_8U);
|
||||
|
||||
for (int i=0; i<4; i++)
|
||||
{
|
||||
|
||||
CvLineIterator iterator;
|
||||
const int count = cvInitLineIterator(
|
||||
&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
|
||||
);
|
||||
const int count = cvInitLineIterator( &tmp, pts[i], pts[(i+1)%4], &iterator, 4);
|
||||
|
||||
for( int j = 0; j < count; j++ ){
|
||||
sumValues += iterator.ptr[0];
|
||||
|
Loading…
Reference in New Issue
Block a user