qvolray

diff src/volume.cc @ 17:535762131d34

fixed to compile on visual studio 2010
author John Tsiombikas <nuclear@member.fsf.org>
date Wed, 11 Apr 2012 01:44:45 +0200
parents 17d9dc2edc91
children 3d05c261a2f4
line diff
     1.1 --- a/src/volume.cc	Wed Apr 11 01:00:40 2012 +0300
     1.2 +++ b/src/volume.cc	Wed Apr 11 01:44:45 2012 +0200
     1.3 @@ -4,13 +4,7 @@
     1.4  #include <ctype.h>
     1.5  #include <list>
     1.6  #include <string>
     1.7 -
     1.8 -#ifndef __APPLE__
     1.9 -#include <GL/gl.h>
    1.10 -#else
    1.11 -#include <OpenGL/gl.h>
    1.12 -#endif
    1.13 -
    1.14 +#include <GL/glew.h>
    1.15  #include <imago2.h>
    1.16  #include "volume.h"
    1.17  
    1.18 @@ -59,7 +53,10 @@
    1.19  	img_destroy(&img);
    1.20  
    1.21  	/* put the volume data into the alpha component */
    1.22 -	for(auto slice : slist) {
    1.23 +	//for(auto slice : slist) { // fucking vs2010 doesn't support range-for
    1.24 +	for(auto iter = slist.begin(); iter != slist.end(); iter++) {
    1.25 +		auto slice = *iter;
    1.26 +
    1.27  		int x, y, xsz, ysz;
    1.28  		float *pixels, *src;
    1.29