Skip to content

Make it compile under newer ImageMagick version #7

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

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

Make it compile under newer ImageMagick version #7

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
6 changes: 3 additions & 3 deletions sample.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Sample::Sample(char *str) {
data[y] = new unsigned char[X];
for( int x=0; x<X; x++) {
Color pc = img->pixelColor(x,y);
data[y][x] = 255*((float)pc.redQuantum()/MaxRGB);
data[y][x] = 255*((float)pc.quantumRed()/QuantumRange);
}
}

Expand Down Expand Up @@ -206,7 +206,7 @@ void Sample::getRegion(int *vec, int x, int y, int s, int t, int rp1, int rp2) {

//Remove the pixels of the region that don't belong
//to any connected component of rp1 or rp2 from the MFSET
Color white(MaxRGB,MaxRGB,MaxRGB);
Color white(QuantumRange,QuantumRange,QuantumRange);
for(int i=y; i<=t; i++)
for(int j=x; j<=s; j++) {
int rp = mfset->find(j,i);
Expand All @@ -221,7 +221,7 @@ void Sample::getRegion(int *vec, int x, int y, int s, int t, int rp1, int rp2) {
for(int i=0; i<15; i++)
for(int j=0; j<15; j++) {
Color pc = reg.pixelColor(j,i);
vec[i*15+j] = 255*((float)(pc.redQuantum())/MaxRGB);
vec[i*15+j] = 255*((float)(pc.quantumRed())/QuantumRange);
}

}
Expand Down