mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0023272: Image comparison algorithm
A new class Image_Diff for comparison of images and a draw-command "diffimage", which compares 2 images. Image_PixMap redesigned to provide interface for low-level image operations. New Image_AlienPixMap class now intended for Save/Load functionality. Aspect_PixMap class dropped. Xw_PixMap and WNT_PixMap classes now do not inherit from Aspect_PixMap and deprecated. ToPixMap methods now retrieve Image_PixMap as argument. Conflicts: src/ViewerTest/ViewerTest.cxx Remarks applied Fix compilation (correct merging error) Eliminated Aspect <-> Image cyclic dependency Fixed GIF dump in case of BGR32 image format
This commit is contained in:
@@ -53,3 +53,4 @@ Graphic3d_AspectText3d.cxx
|
||||
Graphic3d_WNTGraphicDevice.cxx
|
||||
Graphic3d_NameOfFont.hxx
|
||||
Graphic3d_PtrFrameBuffer.hxx
|
||||
Graphic3d_BufferType.hxx
|
||||
|
@@ -329,6 +329,7 @@ is
|
||||
---------------------------
|
||||
|
||||
imported PrimitiveArray;
|
||||
imported BufferType;
|
||||
|
||||
imported CBitFields20;
|
||||
---Purpose: Defines the C structure
|
||||
|
29
src/Graphic3d/Graphic3d_BufferType.hxx
Normal file
29
src/Graphic3d/Graphic3d_BufferType.hxx
Normal file
@@ -0,0 +1,29 @@
|
||||
// Copyright (c) 2012 OPEN CASCADE SAS
|
||||
//
|
||||
// The content of this file is subject to the Open CASCADE Technology Public
|
||||
// License Version 6.5 (the "License"). You may not use the content of this file
|
||||
// except in compliance with the License. Please obtain a copy of the License
|
||||
// at http://www.opencascade.org and read it completely before using this file.
|
||||
//
|
||||
// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
|
||||
// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
|
||||
//
|
||||
// The Original Code and all software distributed under the License is
|
||||
// distributed on an "AS IS" basis, without warranty of any kind, and the
|
||||
// Initial Developer hereby disclaims all such warranties, including without
|
||||
// limitation, any warranties of merchantability, fitness for a particular
|
||||
// purpose or non-infringement. Please see the License for the specific terms
|
||||
// and conditions governing the rights and limitations under the License.
|
||||
|
||||
#ifndef _Graphic3d_BufferType_H__
|
||||
#define _Graphic3d_BufferType_H__
|
||||
|
||||
//! Define buffers available for dump
|
||||
typedef enum
|
||||
{
|
||||
Graphic3d_BT_RGB, //!< color buffer without alpha component
|
||||
Graphic3d_BT_RGBA, //!< color buffer
|
||||
Graphic3d_BT_Depth //!< depth buffer
|
||||
} Graphic3d_BufferType;
|
||||
|
||||
#endif // _Graphic3d_BufferType_H__
|
@@ -71,6 +71,7 @@ uses
|
||||
PlaneAngle from Quantity,
|
||||
|
||||
AlienImage from AlienImage,
|
||||
PixMap from Image,
|
||||
|
||||
Array1OfEdge from Aspect,
|
||||
CLayer2d from Aspect,
|
||||
@@ -93,7 +94,7 @@ uses
|
||||
CPlane from Graphic3d,
|
||||
CStructure from Graphic3d,
|
||||
CView from Graphic3d,
|
||||
CRawBufferData from Image,
|
||||
BufferType from Graphic3d,
|
||||
Structure from Graphic3d,
|
||||
TextPath from Graphic3d,
|
||||
TypeOfComposition from Graphic3d,
|
||||
@@ -1008,8 +1009,9 @@ is
|
||||
---Purpose: Change offscreen FBO viewport.
|
||||
|
||||
BufferDump( me : mutable;
|
||||
view : CView from Graphic3d;
|
||||
buffer : in out CRawBufferData from Image )
|
||||
theCView : CView from Graphic3d;
|
||||
theImage : in out PixMap from Image;
|
||||
theBufferType : BufferType from Graphic3d )
|
||||
returns Boolean from Standard
|
||||
is deferred;
|
||||
---Purpose: Dump active rendering buffer into specified memory buffer.
|
||||
|
Reference in New Issue
Block a user