Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/openexr-01-templ.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3075 2195bb621a17
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3075
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
     1
 
--- openexr-1.7.0/IlmImf/ImfChannelListAttribute.cpp	2010-07-17 01:11:51.000000000 +0200
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
     2
 
+++ openexr-1.7.0-patch/IlmImf/ImfChannelListAttribute.cpp	2010-12-18 17:47:35.363105716 +0100
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
     3
 
@@ -47,9 +47,10 @@
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
     4
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
     5
 
 namespace {
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
     6
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
     7
 
-template <size_t N>
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
     8
 
-void checkIsNullTerminated (const char (&str)[N], const char *what)
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
     9
 
+void checkIsNullTerminated (const char *str, const char *what)
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    10
 
 {
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    11
 
+    int N = strlen(str);
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    12
 
+
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    13
 
     for (int i = 0; i < N; ++i) {
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    14
 
         if (str[i] == '\0')
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    15
 
             return;
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    16
 
--- openexr-1.7.0/IlmImf/ImfHeader.cpp	2010-07-17 01:11:52.000000000 +0200
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    17
 
+++ openexr-1.7.0-patch/IlmImf/ImfHeader.cpp	2010-12-18 17:59:42.370920081 +0100
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    18
 
@@ -146,9 +146,9 @@
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    19
 
     return false;
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    20
 
 }
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    21
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    22
 
-template <size_t N>
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    23
 
-void checkIsNullTerminated (const char (&str)[N], const char *what)
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    24
 
+void checkIsNullTerminated (const char *str, const char *what)
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    25
 
 {
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    26
 
+	int N = strlen(str);
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    27
 
 	for (int i = 0; i < N; ++i) {
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    28
 
 		if (str[i] == '\0')
2195bb621a17 SFEopenexr.spec: bump to 1.7.0, use Sun Studio
jurikm
parents:
diff changeset 
    29
 
 			return;
upstream/spec-files-extra