[GEM-cvs] SF.net SVN: pd-gem:[2830] trunk/Gem/src/Base
Brought to you by:
zmoelnig
From: <zmo...@us...> - 2009-06-02 09:21:01
|
Revision: 2830 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=2830&view=rev Author: zmoelnig Date: 2009-06-02 09:20:59 +0000 (Tue, 02 Jun 2009) Log Message: ----------- removed unneded variables and commented out code Modified Paths: -------------- trunk/Gem/src/Base/GemEvent.cpp trunk/Gem/src/Base/GemPBuffer.cpp trunk/Gem/src/Base/GemPixUtil.cpp Modified: trunk/Gem/src/Base/GemEvent.cpp =================================================================== --- trunk/Gem/src/Base/GemEvent.cpp 2009-06-02 09:16:51 UTC (rev 2829) +++ trunk/Gem/src/Base/GemEvent.cpp 2009-06-02 09:20:59 UTC (rev 2830) @@ -34,9 +34,6 @@ static CallbackList *s_motionList = NULL; static CallbackList *s_buttonList = NULL; static CallbackList *s_wheelList = NULL; -static CallbackList *s_tabmotionList = NULL; -static CallbackList *s_tabrotationList = NULL; -static CallbackList *s_tabbuttonList = NULL; static CallbackList *s_keyboardList = NULL; static CallbackList *s_resizeList = NULL; @@ -428,6 +425,7 @@ theList = theList->next; } break; + default: break; } gem_event_queue_item_t*old = events; Modified: trunk/Gem/src/Base/GemPBuffer.cpp =================================================================== --- trunk/Gem/src/Base/GemPBuffer.cpp 2009-06-02 09:16:51 UTC (rev 2829) +++ trunk/Gem/src/Base/GemPBuffer.cpp 2009-06-02 09:20:59 UTC (rev 2830) @@ -206,43 +206,16 @@ #pragma mark ---- Error Reporting ---- -// C string to Pascal string -static void cstr2pstr (StringPtr outString, const char *inString) -{ - unsigned short x = 0; - do { - outString [x + 1] = (unsigned char) inString [x]; - x++; - } while ((inString [x] != 0) && (x < 256)); - outString [0] = x; -} - // --------------------------------- float gErrorTime = 0.0; extern AbsoluteTime gStartTime; char gErrorMessage[256] = ""; -// return float elpased time in seconds since app start -static float getElapsedTime (void) -{ - float deltaTime = (float) AbsoluteDeltaToDuration (UpTime(), gStartTime); - if (0 > deltaTime) // if negative microseconds - deltaTime /= -1000000.0; - else // else milliseconds - deltaTime /= 1000.0; - return deltaTime; -} // error reporting as both window message and debugger string void reportError (char * strError) { - Str255 strErr = "\p"; - //gErrorTime = getElapsedTime (); //sprintf (gErrorMessage, "Error: %s (at time: %0.1f secs)", strError, gErrorTime); error ("Error: %s", strError); - - // out as debug string - //cstr2pstr (strErr, gErrorMessage); - //DebugStr (strErr); } // --------------------------------- @@ -261,8 +234,7 @@ PBuffer::PBuffer(int width, int height, int flag) : width(width), height(height) { OSStatus err = noErr; - long args[4],*arg; - CGLPixelFormatAttribute *att,attrib[64], attrib_float[64]; + CGLPixelFormatAttribute *att,attrib[64]; GLint vs, npf; // setup offscreen context @@ -329,7 +301,6 @@ */ void PBuffer::enable() { - OSErr err; GLint vs; cglReportError (CGLSetCurrentContext (data->context)); @@ -344,17 +315,7 @@ /* */ void PBuffer::disable() { - OSErr err; - //glFlush(); - //cglReportError( CGLFlushDrawable( data->old_context )); - //cglReportError( CGLClearDrawable( data->context )); - //printf ("before disable Context (0x%X) Renderer: %s\n",CGLGetCurrentContext(), glGetString (GL_RENDERER)); cglReportError ( CGLSetCurrentContext( data->old_context) ); - //cglReportError( CGLTexImagePBuffer(data->old_context, data->pbuffer, GL_FRONT) ); - //aglSwapBuffers( data->context ); - //glFlush(); - //err = aglSetCurrentContext( data->old_context); - //printf ("disable Context (0x%X) Renderer: %s\n",CGLGetCurrentContext(), glGetString (GL_RENDERER)); return; } #elif defined __WIN32__ Modified: trunk/Gem/src/Base/GemPixUtil.cpp =================================================================== --- trunk/Gem/src/Base/GemPixUtil.cpp 2009-06-02 09:16:51 UTC (rev 2829) +++ trunk/Gem/src/Base/GemPixUtil.cpp 2009-06-02 09:20:59 UTC (rev 2830) @@ -1701,7 +1701,6 @@ break; case GL_YUV422_GEM: { - int grey_i=0; position = (((X+(upsidedown?(ysize-Y):Y)*xsize)>>1)<<1); pixels=data+position*csize; grey = CLAMP(pixels[((X%2)?chY1:chY0)]-Y_OFFSET); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |