summaryrefslogtreecommitdiff
path: root/html
diff options
context:
space:
mode:
authorscuri <scuri>2010-10-25 18:29:06 +0000
committerscuri <scuri>2010-10-25 18:29:06 +0000
commitb007c2695ead1e484cf327765c47d8346f632447 (patch)
tree383fa5243f5fc20349f3e7f79b6fcf079e8378e9 /html
parentaff7346948dc33cf2ebb22ed7ef1b93796c85ce7 (diff)
*** empty log message ***
Diffstat (limited to 'html')
-rw-r--r--html/en/building.html4
-rw-r--r--html/en/history.html15
-rw-r--r--html/examples/glut_capture.c2
3 files changed, 17 insertions, 4 deletions
diff --git a/html/en/building.html b/html/en/building.html
index 737cf1c..4c4b564 100644
--- a/html/en/building.html
+++ b/html/en/building.html
@@ -122,12 +122,12 @@ cd ..
mkdir cd
cd cd
-tar -xpvzf cd-5.4_Linux26g4_lib.tar.gz
+tar -xpvzf ../cd-5.4_Linux26g4_lib.tar.gz
cd ..
mkdir im
cd im
-tar -xpvzf im-3.6.2_Linux26g4_lib.tar.gz
+tar -xpvzf ../im-3.6.2_Linux26g4_lib.tar.gz
cd ..
</pre>
diff --git a/html/en/history.html b/html/en/history.html
index 89ff861..f789543 100644
--- a/html/en/history.html
+++ b/html/en/history.html
@@ -26,8 +26,21 @@
<h2>History of Changes</h2>
<h3 dir="ltr">
- CVS (12/Aug/2010)</h3>
+ CVS (25/Oct/2010)</h3>
<ul dir="ltr">
+ <li dir="ltr"><span class="hist_new">New:</span><span style="color: #008000"><span
+ style="color: #000000">
+ function </span></span><strong>imImageCreateFromOpenGLData</strong>.</li>
+ <li dir="ltr">
+ <span class="hist_changed">Changed:</span> the function <strong>
+ imConvertPacking</strong> now has one more parameter so src_depth can be
+ different from dst_depth.</li>
+ <li dir="ltr">
+ <span style="color: #008000">
+ <span
+ style="color: #000000">
+ <span class="hist_fixed">Fixed:</span> </span></span><strong>
+ imImageGetOpenGLData</strong> for some configurations.</li>
<li dir="ltr"><span style="color: #008000">
<span
style="color: #000000">
diff --git a/html/examples/glut_capture.c b/html/examples/glut_capture.c
index 80aadd2..b9a1779 100644
--- a/html/examples/glut_capture.c
+++ b/html/examples/glut_capture.c
@@ -152,7 +152,7 @@ void idle(void)
}
}
- imConvertPacking(image->data[0], gl_data, image->width, image->height, image->depth, image->data_type, 0);
+ imConvertPacking(image->data[0], gl_data, image->width, image->height, image->depth, image->depth, image->data_type, 0);
display();
}
}