Skip to content

Commit

Permalink
Merge pull request #961 from rodlie/RB-2.5-buildfix
Browse files Browse the repository at this point in the history
Debug build fix
  • Loading branch information
rodlie committed Apr 20, 2024
2 parents 5275dcb + 7ddcfe8 commit b1a5210
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Engine/Image.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -857,8 +857,7 @@ Image::makeParams(const RectD & rod, // the image rod in canonical coordinate
U32 textureTarget)
{
#ifdef DEBUG
RectI pixelRod;
rod.toPixelEnclosing(mipmapLevel, par, &pixelRod);
const RectI pixelRod = rod.toPixelEnclosing(mipmapLevel, par);
assert( bounds.left() >= pixelRod.left() && bounds.right() <= pixelRod.right() &&
bounds.bottom() >= pixelRod.bottom() && bounds.top() <= pixelRod.top() );
#endif
Expand Down
3 changes: 1 addition & 2 deletions Engine/OfxEffectInstance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2046,8 +2046,7 @@ OfxEffectInstance::render(const RenderActionArgs& args)
// check the dimensions of output images
const RectI & dstBounds = firstPlane.second->getBounds();
const RectD & dstRodCanonical = firstPlane.second->getRoD();
RectI dstRod;
dstRodCanonical.toPixelEnclosing(args.mappedScale, firstPlane.second->getPixelAspectRatio(), &dstRod);
const RectI dstRod = dstRodCanonical.toPixelEnclosing( args.mappedScale, firstPlane.second->getPixelAspectRatio() );

if ( !supportsTiles() && !isDuringPaintStrokeCreationThreadLocal() ) {
// http://openfx.sourceforge.net/Documentation/1.3/ofxProgrammingReference.html#kOfxImageEffectPropSupportsTiles
Expand Down

0 comments on commit b1a5210

Please sign in to comment.