0027772: Foundation Classes - define Standard_Boolean using C++ type "bool" instead...

[occt.git] / src / Draw / Draw_Window_1.mm

diff --git a/src/Draw/Draw_Window_1.mm b/src/Draw/Draw_Window_1.mm
index 492151d..222d728 100644 (file)
--- a/src/Draw/Draw_Window_1.mm
+++ b/src/Draw/Draw_Window_1.mm
@@ -1,9 +1,9 @@
-// Copyright (c) 2014 OPEN CASCADE SAS
+// Copyright (c) 2013-2014 OPEN CASCADE SAS
 //
 // This file is part of Open CASCADE Technology software library.
 //
-// This library is free software; you can redistribute it and / or modify it
-// under the terms of the GNU Lesser General Public version 2.1 as published
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
 // by the Free Software Foundation, with special exception defined in the file
 // OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
 // distribution for complete text of the license and disclaimer of any warranty.
@@ -48,7 +48,7 @@
 
 - (void )drawRect: (NSRect )theRect
 {
-
+  (void )theRect;
   NSRect aBounds = NSMakeRect (0.0, 0.0, myImage.size.width, myImage.size.height);
 
   [myImage drawInRect: aBounds
@@ -511,7 +511,8 @@ void Draw_Window::SetColor (const Standard_Integer& theColor)
 //=======================================================================
 void Draw_Window::SetMode (const Standard_Integer& theMode)
 {
-  //
+  // unsupported
+  (void )theMode;
 }
 
 //=======================================================================
@@ -531,22 +532,19 @@ 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]];
 
+  NSDictionary* anImgProps = [NSDictionary dictionaryWithObject: [NSNumber numberWithFloat: 0.8]
+                                                         forKey: NSImageCompressionFactor];
+
   NSData* aData = [anImageRep representationUsingType: aFileType 
-                                           properties: nil];
+                                           properties: anImgProps];
 
   Standard_Boolean isSuccess = [aData writeToFile: aFileName
                                        atomically: NO];
@@ -585,7 +583,6 @@ void GetNextEvent (Standard_Boolean  theWait,
   theWindowNumber   = [aWindow windowNumber];
 
   NSPoint aMouseLoc = [aView convertPoint: [anEvent locationInWindow] fromView: nil];
-  NSRect  aBounds   = [aView bounds];
 
   theX = Standard_Integer (aMouseLoc.x);
   theY = Standard_Integer (aMouseLoc.y);