OpenSystemsDevelopment / qpdf

Commit 22c6b8ccbc9693d2e9c9015a976188fc1e00e517

Authored by m-holger
1 parent 320bbb98

Code tidy QPDFObjectHandle::newArray

Inline Side-by-side
Showing 1 changed file with 15 additions and 22 deletions
libqpdf/QPDFObjectHandle.cc
  View file @22c6b8c
@@ -1934,38 +1934,31 @@ QPDFObjectHandle::newArray(std::vector<QPDFObjectHandle> const& items) @@ -1934,38 +1934,31 @@ QPDFObjectHandle::newArray(std::vector<QPDFObjectHandle> const& items)
1934 QPDFObjectHandle 1934 QPDFObjectHandle
1935 QPDFObjectHandle::newArray(Rectangle const& rect) 1935 QPDFObjectHandle::newArray(Rectangle const& rect)
1936 { 1936 {
1937 - std::vector<QPDFObjectHandle> items;  
1938 - items.push_back(newReal(rect.llx));  
1939 - items.push_back(newReal(rect.lly));  
1940 - items.push_back(newReal(rect.urx));  
1941 - items.push_back(newReal(rect.ury));  
1942 - return newArray(items); 1937 + return newArray({newReal(rect.llx), newReal(rect.lly), newReal(rect.urx), newReal(rect.ury)});
1943 } 1938 }
1944 1939
1945 QPDFObjectHandle 1940 QPDFObjectHandle
1946 QPDFObjectHandle::newArray(Matrix const& matrix) 1941 QPDFObjectHandle::newArray(Matrix const& matrix)
1947 { 1942 {
1948 - std::vector<QPDFObjectHandle> items;  
1949 - items.push_back(newReal(matrix.a));  
1950 - items.push_back(newReal(matrix.b));  
1951 - items.push_back(newReal(matrix.c));  
1952 - items.push_back(newReal(matrix.d));  
1953 - items.push_back(newReal(matrix.e));  
1954 - items.push_back(newReal(matrix.f));  
1955 - return newArray(items); 1943 + return newArray(
  1944 + {newReal(matrix.a),
  1945 + newReal(matrix.b),
  1946 + newReal(matrix.c),
  1947 + newReal(matrix.d),
  1948 + newReal(matrix.e),
  1949 + newReal(matrix.f)});
1956 } 1950 }
1957 1951
1958 QPDFObjectHandle 1952 QPDFObjectHandle
1959 QPDFObjectHandle::newArray(QPDFMatrix const& matrix) 1953 QPDFObjectHandle::newArray(QPDFMatrix const& matrix)
1960 { 1954 {
1961 - std::vector<QPDFObjectHandle> items;  
1962 - items.push_back(newReal(matrix.a));  
1963 - items.push_back(newReal(matrix.b));  
1964 - items.push_back(newReal(matrix.c));  
1965 - items.push_back(newReal(matrix.d));  
1966 - items.push_back(newReal(matrix.e));  
1967 - items.push_back(newReal(matrix.f));  
1968 - return newArray(items); 1955 + return newArray(
  1956 + {newReal(matrix.a),
  1957 + newReal(matrix.b),
  1958 + newReal(matrix.c),
  1959 + newReal(matrix.d),
  1960 + newReal(matrix.e),
  1961 + newReal(matrix.f)});
1969 } 1962 }
1970 1963
1971 QPDFObjectHandle 1964 QPDFObjectHandle