Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[11211] trunk
|
From: <ai...@us...> - 2010-09-25 20:33:24
|
Revision: 11211
http://plplot.svn.sourceforge.net/plplot/?rev=11211&view=rev
Author: airwin
Date: 2010-09-25 20:33:17 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
Style recent changes.
Modified Paths:
--------------
trunk/drivers/cairo.c
trunk/drivers/mem.c
trunk/drivers/qt.cpp
trunk/src/plarc.c
trunk/src/plcore.c
Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c 2010-09-25 20:30:22 UTC (rev 11210)
+++ trunk/drivers/cairo.c 2010-09-25 20:33:17 UTC (rev 11211)
@@ -2433,13 +2433,15 @@
cairo_mem[1] = input_mem[0]; /* R */
cairo_mem[2] = input_mem[1]; /* G */
cairo_mem[3] = input_mem[2]; /* B */
- if ( pls->dev_mem_alpha == 1){
- cairo_mem[0] = input_mem[3];
- input_mem += 4;
- }
- else {
- input_mem += 3;
- }
+ if ( pls->dev_mem_alpha == 1 )
+ {
+ cairo_mem[0] = input_mem[3];
+ input_mem += 4;
+ }
+ else
+ {
+ input_mem += 3;
+ }
cairo_mem += 4;
}
}
@@ -2450,13 +2452,15 @@
cairo_mem[2] = input_mem[0]; /* R */
cairo_mem[1] = input_mem[1]; /* G */
cairo_mem[0] = input_mem[2]; /* B */
- if ( pls->dev_mem_alpha == 1){
- cairo_mem[3] = input_mem[3];
- input_mem += 4;
- }
- else {
- input_mem += 3;
- }
+ if ( pls->dev_mem_alpha == 1 )
+ {
+ cairo_mem[3] = input_mem[3];
+ input_mem += 4;
+ }
+ else
+ {
+ input_mem += 3;
+ }
cairo_mem += 4;
}
}
@@ -2503,16 +2507,18 @@
{
for ( i = 0; i < ( pls->xlength * pls->ylength ); i++ )
{
- memory[0] = cairo_surface_data[1]; /* R */
- memory[1] = cairo_surface_data[2]; /* G */
- memory[2] = cairo_surface_data[3]; /* B */
- if ( pls->dev_mem_alpha == 1){
- memory[3] = cairo_surface_data[0];
- memory += 4;
- }
- else {
- memory += 3;
- }
+ memory[0] = cairo_surface_data[1]; /* R */
+ memory[1] = cairo_surface_data[2]; /* G */
+ memory[2] = cairo_surface_data[3]; /* B */
+ if ( pls->dev_mem_alpha == 1 )
+ {
+ memory[3] = cairo_surface_data[0];
+ memory += 4;
+ }
+ else
+ {
+ memory += 3;
+ }
cairo_surface_data += 4;
}
}
@@ -2520,16 +2526,18 @@
{
for ( i = 0; i < ( pls->xlength * pls->ylength ); i++ )
{
- memory[0] = cairo_surface_data[2]; /* R */
- memory[1] = cairo_surface_data[1]; /* G */
- memory[2] = cairo_surface_data[0]; /* B */
- if ( pls->dev_mem_alpha == 1){
- memory[3] = cairo_surface_data[3];
- memory += 4;
- }
- else {
- memory += 3;
- }
+ memory[0] = cairo_surface_data[2]; /* R */
+ memory[1] = cairo_surface_data[1]; /* G */
+ memory[2] = cairo_surface_data[0]; /* B */
+ if ( pls->dev_mem_alpha == 1 )
+ {
+ memory[3] = cairo_surface_data[3];
+ memory += 4;
+ }
+ else
+ {
+ memory += 3;
+ }
cairo_surface_data += 4;
}
}
Modified: trunk/drivers/mem.c
===================================================================
--- trunk/drivers/mem.c 2010-09-25 20:30:22 UTC (rev 11210)
+++ trunk/drivers/mem.c 2010-09-25 20:33:17 UTC (rev 11211)
@@ -80,7 +80,7 @@
if ( pls->dev_mem_alpha == 1 )
{
- plexit( "The mem driver does not support alpha values! Use plsmem!");
+ plexit( "The mem driver does not support alpha values! Use plsmem!" );
}
plP_setpxl( (PLFLT) 4, (PLFLT) 4 ); /* rough pixels/mm on *my* screen */
Modified: trunk/drivers/qt.cpp
===================================================================
--- trunk/drivers/qt.cpp 2010-09-25 20:30:22 UTC (rev 11210)
+++ trunk/drivers/qt.cpp 2010-09-25 20:33:17 UTC (rev 11211)
@@ -1681,8 +1681,8 @@
void plD_init_memqt( PLStream * pls )
{
- int i;
- double dpi;
+ int i;
+ double dpi;
unsigned char *qt_mem;
unsigned char *input_mem;
@@ -1723,7 +1723,7 @@
pls->ylength = pls->phyyma;
/* Save a pointer to the user supplied memory */
- input_mem = (unsigned char *)pls->dev;
+ input_mem = (unsigned char *) pls->dev;
/* Create a appropriately sized raster device */
pls->dev = new QtRasterDevice( pls->xlength, pls->ylength );
@@ -1746,21 +1746,23 @@
This device assumes that the format of the QImage
is RGB32 (or ARGB). */
- qt_mem = ( (QtRasterDevice *) pls->dev )->scanLine(0);
+ qt_mem = ( (QtRasterDevice *) pls->dev )->scanLine( 0 );
for ( i = 0; i < ( pls->xlength * pls->ylength ); i++ )
{
qt_mem[2] = input_mem[0]; /* R */
qt_mem[1] = input_mem[1]; /* G */
qt_mem[0] = input_mem[2]; /* B */
- if ( pls->dev_mem_alpha == 1){
- qt_mem[3] = input_mem[3];
- input_mem += 4;
- }
- else {
- input_mem += 3;
- }
- qt_mem += 4;
+ if ( pls->dev_mem_alpha == 1 )
+ {
+ qt_mem[3] = input_mem[3];
+ input_mem += 4;
+ }
+ else
+ {
+ input_mem += 3;
+ }
+ qt_mem += 4;
}
( (QtRasterDevice*) ( pls->dev ) )->setResolution( dpi );
@@ -1781,21 +1783,23 @@
unsigned char *qt_mem;
memory = ( (QtRasterDevice *) pls->dev )->memory;
- qt_mem = ( (QtRasterDevice *) pls->dev )->scanLine(0);
+ qt_mem = ( (QtRasterDevice *) pls->dev )->scanLine( 0 );
for ( i = 0; i < ( pls->xlength * pls->ylength ); i++ )
{
- memory[0] = qt_mem[2]; /* R */
- memory[1] = qt_mem[1]; /* G */
- memory[2] = qt_mem[0]; /* B */
- if ( pls->dev_mem_alpha == 1){
- memory[3] = qt_mem[3];
- memory += 4;
- }
- else {
- memory += 3;
- }
- qt_mem += 4;
+ memory[0] = qt_mem[2]; /* R */
+ memory[1] = qt_mem[1]; /* G */
+ memory[2] = qt_mem[0]; /* B */
+ if ( pls->dev_mem_alpha == 1 )
+ {
+ memory[3] = qt_mem[3];
+ memory += 4;
+ }
+ else
+ {
+ memory += 3;
+ }
+ qt_mem += 4;
}
}
Modified: trunk/src/plarc.c
===================================================================
--- trunk/src/plarc.c 2010-09-25 20:30:22 UTC (rev 11210)
+++ trunk/src/plarc.c 2010-09-25 20:33:17 UTC (rev 11211)
@@ -21,7 +21,7 @@
#include "plplotP.h"
-#define CIRCLE_SEGMENTS ( PL_MAXPOLY - 1 )
+#define CIRCLE_SEGMENTS ( PL_MAXPOLY - 1 )
#define DEG_TO_RAD( x ) ( ( x ) * M_PI / 180.0 )
#define PLARC_POINT_X( x, a, b, theta ) ( ( x ) + ( ( a ) * cos( theta ) ) )
Modified: trunk/src/plcore.c
===================================================================
--- trunk/src/plcore.c 2010-09-25 20:30:22 UTC (rev 11210)
+++ trunk/src/plcore.c 2010-09-25 20:33:17 UTC (rev 11211)
@@ -3455,7 +3455,7 @@
void
c_plsmem( PLINT maxx, PLINT maxy, void *plotmem )
{
- plsc->dev = plotmem;
+ plsc->dev = plotmem;
plsc->dev_mem_alpha = 0;
plP_setphy( 0, maxx, 0, maxy );
}
@@ -3465,7 +3465,7 @@
void
c_plsmema( PLINT maxx, PLINT maxy, void *plotmem )
{
- plsc->dev = plotmem;
+ plsc->dev = plotmem;
plsc->dev_mem_alpha = 1;
plP_setphy( 0, maxx, 0, maxy );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
