Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 70303
Collapse All | Expand All

(-)boinc/api/gutil.C (-2 / +20 lines)
Lines 1128-1133 Link Here
1128
1128
1129
int TEXTURE_DESC::load_image_file(const char* filename) {
1129
int TEXTURE_DESC::load_image_file(const char* filename) {
1130
    int retval;
1130
    int retval;
1131
    int sizeX;
1132
    int sizeY;
1133
    int sizeZ;
1134
    unsigned int *pImage;
1131
    FILE* f;
1135
    FILE* f;
1132
    f = boinc_fopen(filename, "r");
1136
    f = boinc_fopen(filename, "r");
1133
    if (!f) goto done;
1137
    if (!f) goto done;
Lines 1146-1153 Link Here
1146
    retval = CreateTextureTGA(filename);
1150
    retval = CreateTextureTGA(filename);
1147
    if (!retval) return 0;
1151
    if (!retval) return 0;
1148
#endif
1152
#endif
1149
	retval = CreateTextureRGB(filename);
1153
    retval = -1;
1150
	if (!retval) return 0;
1154
    if (filename) {
1155
	pImage = read_rgb_texture(filename,&sizeX,&sizeY,&sizeZ);
1156
	if (pImage != NULL) {
1157
	    glPixelStorei(GL_UNPACK_ALIGNMENT,1);
1158
	    glGenTextures(1, (GLuint*)&id);
1159
	    glBindTexture(GL_TEXTURE_2D, id);
1160
	    gluBuild2DMipmaps(GL_TEXTURE_2D, 3, sizeX, sizeY, GL_RGBA, GL_UNSIGNED_BYTE, pImage);
1161
	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
1162
	    glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR);
1163
	    if (pImage) 
1164
		free(pImage);
1165
	    retval = 0;
1166
	}
1167
    }
1168
    if (!retval) return 0;
1151
1169
1152
done:
1170
done:
1153
    present = false;
1171
    present = false;

Return to bug 70303