"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xpdf/TileMap.cc" between
xpdf-4.01.01.tar.gz and xpdf-4.02.tar.gz

About: Xpdf is a PDF viewer for X.

TileMap.cc  (xpdf-4.01.01):TileMap.cc  (xpdf-4.02)
skipping to change at line 595 skipping to change at line 595
*yd = yw - offsetY + state->getScrollY(); *yd = yw - offsetY + state->getScrollY();
return *xd >= 0 && *xd < pageW1 && *yd >= 0 && *yd < pageH1; return *xd >= 0 && *xd < pageW1 && *yd >= 0 && *yd < pageH1;
case displayContinuous: case displayContinuous:
if (totalH < state->getWinH()) { if (totalH < state->getWinH()) {
offsetY = (state->getWinH() - totalH) / 2; offsetY = (state->getWinH() - totalH) / 2;
} else { } else {
offsetY = 0; offsetY = 0;
} }
*pg = findContinuousPage(yw - offsetY + state->getScrollY()); *pg = findContinuousPage(yw - offsetY + state->getScrollY());
if (*pg < 1 || *pg > state->getDoc()->getNumPages()) {
*pg = 0;
*xd = *yd = 0;
return gFalse;
}
pageW1 = pageW[*pg - 1]; pageW1 = pageW[*pg - 1];
pageH1 = pageH[*pg - 1]; pageH1 = pageH[*pg - 1];
if (maxW < state->getWinW()) { if (maxW < state->getWinW()) {
offsetX = (state->getWinW() - maxW) / 2; offsetX = (state->getWinW() - maxW) / 2;
} else { } else {
offsetX = 0; offsetX = 0;
} }
offsetX += (maxW - pageW1) / 2; offsetX += (maxW - pageW1) / 2;
*xd = xw - offsetX + state->getScrollX(); *xd = xw - offsetX + state->getScrollX();
*yd = yw - offsetY - pageY[*pg - 1] + state->getScrollY(); *yd = yw - offsetY - pageY[*pg - 1] + state->getScrollY();
skipping to change at line 658 skipping to change at line 663
return *xd >= 0 && *xd < pageW2 && *yd >= 0 && *yd < pageH2; return *xd >= 0 && *xd < pageW2 && *yd >= 0 && *yd < pageH2;
} }
case displaySideBySideContinuous: case displaySideBySideContinuous:
if (totalH < state->getWinH()) { if (totalH < state->getWinH()) {
offsetY = (state->getWinH() - totalH) / 2; offsetY = (state->getWinH() - totalH) / 2;
} else { } else {
offsetY = 0; offsetY = 0;
} }
*pg = findSideBySideContinuousPage(yw - offsetY + state->getScrollY()); *pg = findSideBySideContinuousPage(yw - offsetY + state->getScrollY());
if (*pg < 1 || *pg > state->getDoc()->getNumPages()) {
*pg = 0;
*xd = *yd = 0;
return gFalse;
}
pageW1 = pageW[*pg - 1]; pageW1 = pageW[*pg - 1];
pageH1 = pageH[*pg - 1]; pageH1 = pageH[*pg - 1];
if (*pg + 1 <= state->getDoc()->getNumPages()) { if (*pg + 1 <= state->getDoc()->getNumPages()) {
pageW2 = pageW[*pg]; pageW2 = pageW[*pg];
pageH2 = pageH[*pg]; pageH2 = pageH[*pg];
} else { } else {
pageW2 = pageH2 = 0; pageW2 = pageH2 = 0;
} }
if (maxW + sideBySidePageSpacing + maxW2 < state->getWinW()) { if (maxW + sideBySidePageSpacing + maxW2 < state->getWinW()) {
offsetX = (state->getWinW() - offsetX = (state->getWinW() -
skipping to change at line 696 skipping to change at line 706
return *xd >= 0 && *xd < pageW2 && *yd >= 0 && *yd < pageH2; return *xd >= 0 && *xd < pageW2 && *yd >= 0 && *yd < pageH2;
} }
case displayHorizontalContinuous: case displayHorizontalContinuous:
if (totalW < state->getWinW()) { if (totalW < state->getWinW()) {
offsetX = (state->getWinW() - totalW) / 2; offsetX = (state->getWinW() - totalW) / 2;
} else { } else {
offsetX = 0; offsetX = 0;
} }
*pg = findHorizContinuousPage(xw - offsetX + state->getScrollX()); *pg = findHorizContinuousPage(xw - offsetX + state->getScrollX());
if (*pg < 1 || *pg > state->getDoc()->getNumPages()) {
*pg = 0;
*xd = *yd = 0;
return gFalse;
}
pageW1 = pageW[*pg - 1]; pageW1 = pageW[*pg - 1];
pageH1 = pageH[*pg - 1]; pageH1 = pageH[*pg - 1];
if (maxH < state->getWinH()) { if (maxH < state->getWinH()) {
offsetY = (state->getWinH() - maxH) / 2; offsetY = (state->getWinH() - maxH) / 2;
} else { } else {
offsetY = 0; offsetY = 0;
} }
*xd = xw - offsetX - pageX[*pg - 1] + state->getScrollX(); *xd = xw - offsetX - pageX[*pg - 1] + state->getScrollX();
*yd = yw - offsetY + state->getScrollY(); *yd = yw - offsetY + state->getScrollY();
return *xd >= 0 && *xd < pageW1 && *yd >= 0 && *yd < pageH1; return *xd >= 0 && *xd < pageW1 && *yd >= 0 && *yd < pageH1;
 End of changes. 3 change blocks. 
0 lines changed or deleted 15 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)