mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0024002: Overall code and build procedure refactoring -- Mac OSX
Draw_Window_1.mm, Cocoa_Window.mm - fix compilation issues on OS X CMake env.build.sh - fix libraries path MSVC project templates - /bigobj flag added for all configurations (x64, x86, release and debug) Standard_Type.hxx - enforce initialization of all type descriptors at library load
This commit is contained in:
@@ -29,9 +29,6 @@
|
||||
#include <Aspect_Convert.hxx>
|
||||
#include <Aspect_WindowDefinitionError.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_HANDLE (Cocoa_Window, Aspect_Window)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(Cocoa_Window, Aspect_Window)
|
||||
|
||||
#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
|
||||
//
|
||||
#else
|
||||
|
@@ -531,18 +531,12 @@ Standard_Boolean Draw_Window::Save (Standard_CString theFileName) const
|
||||
[NSNumber numberWithInt: NSJPEGFileType], @"jpg",
|
||||
[NSNumber numberWithInt: NSGIFFileType], @"gif",
|
||||
nil];
|
||||
|
||||
NSBitmapImageFileType aFileType;
|
||||
|
||||
if ([aFileTypeDict valueForKey: aFileExtension] != nil)
|
||||
{
|
||||
aFileType = [[aFileTypeDict valueForKey: aFileExtension] intValue];
|
||||
}
|
||||
else
|
||||
if ([aFileTypeDict valueForKey: aFileExtension] == NULL)
|
||||
{
|
||||
return Standard_False; // unsupported image extension
|
||||
}
|
||||
|
||||
NSBitmapImageFileType aFileType = (NSBitmapImageFileType )[[aFileTypeDict valueForKey: aFileExtension] intValue];
|
||||
NSBitmapImageRep* anImageRep = [NSBitmapImageRep imageRepWithData: [myImageBuffer TIFFRepresentation]];
|
||||
|
||||
NSData* aData = [anImageRep representationUsingType: aFileType
|
||||
|
@@ -162,6 +162,8 @@ namespace opencascade {
|
||||
template <typename T>
|
||||
const Handle(Standard_Type)& type_instance<T>::get ()
|
||||
{
|
||||
(void)myInstance; // ensure that myInstance is instantiated
|
||||
|
||||
// static variable inside function ensures that descriptors
|
||||
// are initialized in correct sequence
|
||||
static Handle(Standard_Type) anInstance =
|
||||
|
Reference in New Issue
Block a user