diff options
Diffstat (limited to 'slideshow/source/engine/OGLTrans/win')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx index 66773c4eadf3..fdf575d94faf 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx @@ -859,7 +859,7 @@ RotateAndScaleDepthByHeight* RotateAndScaleDepthByHeight::clone() return new RotateAndScaleDepthByHeight(*this); } -const Primitive& Primitive::operator=(const Primitive& rvalue) +Primitive& Primitive::operator=(const Primitive& rvalue) { for(unsigned int i( 0 ); i < rvalue.Operations.size(); ++i) Operations.push_back(rvalue.Operations[i]->clone()); diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx index d9cb6ca6c16a..9ad9fb05d1b0 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx @@ -224,7 +224,7 @@ public: void applyOperations(double nTime, double SlideWidthScale, double SlideHeightScale); void display(double nTime, double SlideWidthScale, double SlideHeightScale); - const Primitive& operator=(const Primitive& rvalue); + Primitive& operator=(const Primitive& rvalue); /** PushBack a vertex,normal, and tex coord. Each SlideLocation is where on the slide is mapped to this location ( from (0,0) to (1,1) ). This will make sure the correct aspect ratio is used, and helps to make slides begin and end at the correct position. (0,0) is the top left of the slide, and (1,1) is the bottom right. |