Update to tk 8.5.19
This commit is contained in:
@@ -2454,7 +2454,11 @@ ImgPhotoGet(
|
||||
}
|
||||
XFree((char *) visInfoPtr);
|
||||
|
||||
sprintf(buf, ((mono) ? "%d": "%d/%d/%d"), nRed, nGreen, nBlue);
|
||||
if (mono) {
|
||||
sprintf(buf, "%d", nRed);
|
||||
} else {
|
||||
sprintf(buf, "%d/%d/%d", nRed, nGreen, nBlue);
|
||||
}
|
||||
instancePtr->defaultPalette = Tk_GetUid(buf);
|
||||
|
||||
/*
|
||||
@@ -5649,10 +5653,7 @@ ImgGetPhoto(
|
||||
}
|
||||
}
|
||||
if (!alphaOffset) {
|
||||
blockPtr->pixelPtr--;
|
||||
blockPtr->offset[0]++;
|
||||
blockPtr->offset[1]++;
|
||||
blockPtr->offset[2]++;
|
||||
blockPtr->offset[3]= -1; /* Tell caller alpha need not be read */
|
||||
}
|
||||
greenOffset = blockPtr->offset[1] - blockPtr->offset[0];
|
||||
blueOffset = blockPtr->offset[2] - blockPtr->offset[0];
|
||||
@@ -5766,9 +5767,11 @@ ImgGetPhoto(
|
||||
if (newPixelSize>2) {
|
||||
blockPtr->offset[1]= 1;
|
||||
blockPtr->offset[2]= 2;
|
||||
blockPtr->offset[3]= 3;
|
||||
} else {
|
||||
blockPtr->offset[1]= 0;
|
||||
blockPtr->offset[2]= 0;
|
||||
blockPtr->offset[3]= 1;
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user