glretrace: Always pass a format appropriate for the internalFormat when reading pixels.

[apitrace] / cli / cli_trim.cpp

diff --git a/cli/cli_trim.cpp b/cli/cli_trim.cpp
index 4a116eee0e06f65b2258e3058076f57579dae8f6..938329c94d566769cac982a026cc9561b935b60c 100644 (file)
--- a/cli/cli_trim.cpp
+++ b/cli/cli_trim.cpp
@@ -203,7 +203,7 @@ trim_trace(const char *filename, struct trim_options *options)
     trace::ParseBookmark beginning;
     trace::Parser p;
     TraceAnalyzer analyzer(options->trim_flags);
-    std::set<unsigned> *required;
+    trace::FastCallSet *required;
     unsigned frame;
     int call_range_first, call_range_last;
 
@@ -273,7 +273,7 @@ trim_trace(const char *filename, struct trim_options *options)
 
     trace::Writer writer;
     if (!writer.open(options->output.c_str())) {
-        std::cerr << "error: failed to create " << filename << "\n";
+        std::cerr << "error: failed to create " << options->output << "\n";
         return 1;
     }
 
@@ -296,7 +296,7 @@ trim_trace(const char *filename, struct trim_options *options)
             break;
         }
 
-        if (required->find(call->no) != required->end()) {
+        if (required->contains(call->no)) {
             writer.writeCall(call);
 
             if (options->print_callset) {