Исправлен баг в предыдущей заливке.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64153 954022d7-b5bf-4e40-9824-e11837661b57

Исправлен баг в предыдущей заливке.
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64153 954022d7-b5bf-4e40-9824-e11837661b57
b4cde432 · Ilya.Kirillov · Alexander Trofimov · 6bd973e6 · b4cde432
Commit b4cde432 authored Aug 19, 2015 by Ilya.Kirillov Committed by Alexander Trofimov May 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

DesktopEditor/raster/Jp2/Tile.h DesktopEditor/raster/Jp2/Tile.h +4 -4

No files found.
--- a/DesktopEditor/raster/Jp2/Tile.h
+++ b/DesktopEditor/raster/Jp2/Tile.h
@@ -374,8 +374,8 @@ namespace Jpeg2000
 								CodeBlock *pCodeBlock = &pPrecinct->pCodeBlocks[nCodeBlockIndex];

 								// Границы CodeBlock (глобальные)
-                                pCodeBlock->nX0 = (std::min)(nCodeBlockStartX, pPrecinct->nX0);
-                                pCodeBlock->nY0 = (std::min)(nCodeBlockStartY, pPrecinct->nY0);
+                                pCodeBlock->nX0 = (std::max)(nCodeBlockStartX, pPrecinct->nX0);
+                                pCodeBlock->nY0 = (std::max)(nCodeBlockStartY, pPrecinct->nY0);
                                pCodeBlock->nX1 = (std::min)(nCodeBlockEndX, pPrecinct->nX1);
                                pCodeBlock->nY1 = (std::min)(nCodeBlockEndY, pPrecinct->nY1);
 							}
@@ -886,8 +886,8 @@ namespace Jpeg2000

 								// Границы CodeBlock (глобальные)
 								CodeBlock *pCodeBlock = &pPrecinct->pCodeBlocks[nCodeBlockIndex];
-                                pCodeBlock->nX0 = (std::min)(nCodeBlockStartX, pPrecinct->nX0);
-                                pCodeBlock->nY0 = (std::min)(nCodeBlockStartY, pPrecinct->nY0);
+                                pCodeBlock->nX0 = (std::max)(nCodeBlockStartX, pPrecinct->nX0);
+                                pCodeBlock->nY0 = (std::max)(nCodeBlockStartY, pPrecinct->nY0);
                                pCodeBlock->nX1 = (std::min)(nCodeBlockEndX, pPrecinct->nX1);
                                pCodeBlock->nY1 = (std::min)(nCodeBlockEndY, pPrecinct->nY1);
 							}