[Cogl] [PATCH] pedantic style fixes

Owen Taylor otaylor at redhat.com
Thu Jan 24 09:20:15 PST 2013


This looks like correct hard-line-breaking at 80 columns to me. I'll
deal with squashing once we're done with the rest of the changes.

Reviewed by: Owen W. Taylor <otaylor at fishsoup.net>

On Tue, 2012-12-04 at 10:55 +0000, Robert Bragg wrote:
> From: Robert Bragg <robert at linux.intel.com>
> 
> TODO: squash back into owen's patch
> ---
>  cogl/cogl-xlib-renderer.c     |   42 ++++++++++++++++++++++++++--------------
>  cogl/winsys/cogl-winsys-glx.c |   10 ++++++--
>  2 files changed, 34 insertions(+), 18 deletions(-)
> 
> diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl-xlib-renderer.c
> index fff3c35..c3964c1 100644
> --- a/cogl/cogl-xlib-renderer.c
> +++ b/cogl/cogl-xlib-renderer.c
> @@ -202,12 +202,18 @@ compare_outputs (CoglOutput *a,
>  
>  #define CSO(X) COGL_SUBPIXEL_ORDER_ ## X
>  static CoglSubpixelOrder subpixel_map[6][6] = {
> -  { CSO(UNKNOWN), CSO(NONE), CSO(HORIZONTAL_RGB), CSO(HORIZONTAL_BGR), CSO(VERTICAL_RGB),   CSO(VERTICAL_BGR) },   /* 0 */
> -  { CSO(UNKNOWN), CSO(NONE), CSO(VERTICAL_RGB),   CSO(VERTICAL_BGR),   CSO(HORIZONTAL_BGR), CSO(HORIZONTAL_RGB) }, /* 90 */
> -  { CSO(UNKNOWN), CSO(NONE), CSO(HORIZONTAL_BGR), CSO(HORIZONTAL_RGB), CSO(VERTICAL_BGR),   CSO(VERTICAL_RGB) },   /* 180 */
> -  { CSO(UNKNOWN), CSO(NONE), CSO(VERTICAL_BGR),   CSO(VERTICAL_RGB),   CSO(HORIZONTAL_RGB), CSO(HORIZONTAL_BGR) }, /* 270 */
> -  { CSO(UNKNOWN), CSO(NONE), CSO(HORIZONTAL_BGR), CSO(HORIZONTAL_RGB), CSO(VERTICAL_RGB),   CSO(VERTICAL_BGR) },   /* Reflect_X */
> -  { CSO(UNKNOWN), CSO(NONE), CSO(HORIZONTAL_RGB), CSO(HORIZONTAL_BGR), CSO(VERTICAL_BGR),   CSO(VERTICAL_RGB) },   /* Reflect_Y */
> +  { CSO(UNKNOWN), CSO(NONE), CSO(HORIZONTAL_RGB), CSO(HORIZONTAL_BGR),
> +    CSO(VERTICAL_RGB),   CSO(VERTICAL_BGR) },   /* 0 */
> +  { CSO(UNKNOWN), CSO(NONE), CSO(VERTICAL_RGB),   CSO(VERTICAL_BGR),
> +    CSO(HORIZONTAL_BGR), CSO(HORIZONTAL_RGB) }, /* 90 */
> +  { CSO(UNKNOWN), CSO(NONE), CSO(HORIZONTAL_BGR), CSO(HORIZONTAL_RGB),
> +    CSO(VERTICAL_BGR),   CSO(VERTICAL_RGB) },   /* 180 */
> +  { CSO(UNKNOWN), CSO(NONE), CSO(VERTICAL_BGR),   CSO(VERTICAL_RGB),
> +    CSO(HORIZONTAL_RGB), CSO(HORIZONTAL_BGR) }, /* 270 */
> +  { CSO(UNKNOWN), CSO(NONE), CSO(HORIZONTAL_BGR), CSO(HORIZONTAL_RGB),
> +    CSO(VERTICAL_RGB),   CSO(VERTICAL_BGR) },   /* Reflect_X */
> +  { CSO(UNKNOWN), CSO(NONE), CSO(HORIZONTAL_RGB), CSO(HORIZONTAL_BGR),
> +    CSO(VERTICAL_BGR),   CSO(VERTICAL_RGB) },   /* Reflect_Y */

I think this vastly reduces readability, but if sticking to 80 columns
is the most important thing, then of course, there's not much else you
can do.






More information about the Cogl mailing list