Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: rescale precomputed coordinates when image is too large (crossed) #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: rescale precomputed coordinates when image is too large (crossed) #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions src/blackstripes/crossed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <stdint.h>
#include <limits.h>
#include "Python.h"
#include "../lib/sketchy/SketchyImage.h"
#include "../lib/sketchy/Point.h"
Expand Down Expand Up @@ -112,11 +113,10 @@ static void decodePNG(const char* filename,const char* output_filename,float nib
}
fprintf(svgFile,svg_formatstring,"100%","100%", width * scale, (height + extraHeight) * scale, width * scale, (height + extraHeight) * scale, scale);

int i = 0;
float radius = 0;

int16_t *coords;
int size;
uint64_t size;
if(type == 1){
coords = coords_l;
size = sizeof(coords_l);
Expand All @@ -125,13 +125,28 @@ static void decodePNG(const char* filename,const char* output_filename,float nib
size = sizeof(coords_xl);
}

for(i = 0; i < size / sizeof(int16_t); i += 2)
// maximum coords (and/or radius - see below) must lie out of image bounds
int maxXcoord = INT_MIN;
int maxYcoord = INT_MIN;
uint64_t numCoords = size / sizeof(coords[0]);
for (uint64_t i = 0; i < numCoords; i+=2) {
if (coords[i] > maxXcoord) {
maxXcoord = coords[i];
}
if (coords[i+1] > maxYcoord) {
maxYcoord= coords[i+1];
}
}
// keep old default value for coordScale 10.0 if no problem is detected
// so that we only change behaviour of the problematic cases
float coordsScale = fmin(0.5*fmax(maxXcoord/width, maxYcoord/height), 10.0);
for(int i = 0; i < numCoords; i += 2)
{
if(coords[i] == -20){
layerIndex ++;
threshold = levels[layerIndex];
}else if(coords[i] == -10){
radius = coords[i+1] / 10.0;
radius = coords[i+1] / coordsScale;
newstate = 0;
if (newstate != penstate){
to_x = x;
Expand All @@ -140,8 +155,8 @@ static void decodePNG(const char* filename,const char* output_filename,float nib
}
penstate = newstate;
}else{
x = coords[i] / 10.0;
y = coords[i+1] / 10.0;
x = coords[i] / coordsScale;
y = coords[i+1] / coordsScale;
pixelvalue = SketchyImage_getPixel(im,(int)round(x),(int)round(y));
if (pixelvalue < threshold){
newstate = 1;
Expand Down